Let depot_tools use scripts from deps-pulled "script" folder.

BUG=240309
TBR=iannucci@chromium.org

Review URL: https://codereview.chromium.org/139693006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@248420 0039d316-1c4b-4281-b951-d872f2087c98

clang_format.py

@@ -62,11 +62,14 @@ def FindClangFormatToolInChromiumTree():
 
 def FindClangFormatScriptInChromiumTree(script_name):
   """Return a path to a clang-format helper script, or die trying."""
-  # The binaries in platform-specific subdirectories in src/tools/gn/bin.
   script_path = os.path.join(_FindChromiumTree(), 'src', 'third_party',
-                             'clang_format', 'scripts', script_name)
+                             'clang_format', 'script', script_name)
   if not os.path.exists(script_path):
-    raise NotFoundError('File does not exist: %s' % script_path)
+    # TODO(thakis): Remove the fallback to the old location after a few weeks.
+    script_path = os.path.join(_FindChromiumTree(), 'src', 'third_party',
+                               'clang_format', 'scripts', script_name)
+    if not os.path.exists(script_path):
+      raise NotFoundError('File does not exist: %s' % script_path)
   return script_path