Change clang_format.py to search for clang-format in buildtools

clang_format.py

Index: clang_format.py
diff --git a/clang_format.py b/clang_format.py
index f1043bba9fdcca373f145451fea3b609ff49a917..8320e6d2a0dc449d4e07cd82dcf3ab11b19c01c5 100755
--- a/clang_format.py
+++ b/clang_format.py
@@ -23,22 +23,14 @@ class NotFoundError(Exception):
         '  %s' % e)
 
 
-def _FindChromiumSourceRoot():
-  """Return the source root of the current chromium checkout, or die trying."""
-  # The use of .gn is somewhat incongruous here, but we need a file uniquely
-  # existing at src/. GN does the same thing at least.
-  source_root = gclient_utils.FindFileUpwards('.gn')
-  if not source_root:
-    raise NotFoundError(
-        '.gn file not found in any parent of the current path.')
-  return source_root
-
-
 def FindClangFormatToolInChromiumTree():
   """Return a path to the clang-format executable, or die trying."""
-  tool_path = os.path.join(_FindChromiumSourceRoot(), 'third_party',
-                           'clang_format', 'bin',
-                           gclient_utils.GetMacWinOrLinux(),
+  bin_path = gclient_utils.GetBuildtoolsPlatformBinaryPath()
+  if not bin_path:
+    raise NotFoundError(
+        'Could not find checkout in any parent of the current path.')
+
+  tool_path = os.path.join(bin_path,
                            'clang-format' + gclient_utils.GetExeSuffix())

[ncarter (slow), 2014/06/26 18:03:00]

FWIW, the reason I'd gone with "clang_format" instead of "clang-format" is
because of the difficulty in importing a python module with hyphens in its path.
However, this was just defensive against a theoretical problem; we don't have
__init__.py's around anyhow.

   if not os.path.exists(tool_path):
     raise NotFoundError('File does not exist: %s' % tool_path)
@@ -47,8 +39,11 @@ def FindClangFormatToolInChromiumTree():
 
 def FindClangFormatScriptInChromiumTree(script_name):
   """Return a path to a clang-format helper script, or die trying."""
-  script_path = os.path.join(_FindChromiumSourceRoot(), 'third_party',
-                             'clang_format', 'script', script_name)
+  tools_path = gclient_utils.GetBuildtoolsPath()
+  if not tools_path:
+    raise NotFoundError(
+        'Could not find checkout in any parent of the current path.')
+  script_path = os.path.join(tools_path, 'clang_format', 'script', script_name)
   if not os.path.exists(script_path):
     raise NotFoundError('File does not exist: %s' % script_path)
   return script_path