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

depot_tools/clang_format.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Redirects to the version of clang-format checked into the Chrome tree.
 
 clang-format binaries are pulled down from Google Cloud Storage whenever you
 sync Chrome, to platform-specific locations. This script knows how to locate
 those tools, assuming the script is invoked from inside a Chromium checkout."""
@@ skipping 44 matching lines @@
     Contact nick@chromium.org if you have any additional questions.\n\n'''
 
     error_text += 'File does not exist: %s' % tool_path
 
     raise NotFoundError(error_text)
   return tool_path
 
 
 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
 
 
 def main(args):
   try:
     tool = FindClangFormatToolInChromiumTree()
   except NotFoundError, e:
     print >> sys.stderr, e
     sys.exit(1)
 
   # Add some visibility to --help showing where the tool lives, since this
   # redirection can be a little opaque.
   help_syntax = ('-h', '--help', '-help', '-help-list', '--help-list')
   if any(match in args for match in help_syntax):
     print '\nDepot tools redirects you to the clang-format at:\n    %s\n' % tool
 
   return subprocess.call([tool] + sys.argv[1:])
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))