Renaming blink method names inside gmock's EXPECT_CALL macro invocation.

tools/clang/scripts/test_tool.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """Test harness for chromium clang tools."""
 
 import difflib
 import glob
 import json
@@ skipping 47 matching lines @@
                                   'compile_commands.json')
   source_files = glob.glob(os.path.join(test_directory_for_tool,
                                         '*-original.cc'))
   actual_files = ['-'.join([source_file.rsplit('-', 1)[0], 'actual.cc'])
                   for source_file in source_files]
   expected_files = ['-'.join([source_file.rsplit('-', 1)[0], 'expected.cc'])
                     for source_file in source_files]
   include_paths = []
   include_paths.append(
       os.path.realpath(os.path.join(tools_clang_directory, '../..')))
-  # Many gtest headers expect to have testing/gtest/include in the include
-  # search path.
+  # Many gtest and gmock headers expect to have testing/gtest/include and/or
+  # testing/gmock/include in the include search path.
   include_paths.append(
       os.path.realpath(os.path.join(tools_clang_directory,
                                     '../..',
                                     'testing/gtest/include')))
+  include_paths.append(
+      os.path.realpath(os.path.join(tools_clang_directory,
+                                    '../..',
+                                    'testing/gmock/include')))
 
   if len(actual_files) == 0:
     print 'Tool "%s" does not have compatible test files.' % tool_to_test
     return 1
 
   try:
     # Set up the test environment.
     for source, actual in zip(source_files, actual_files):
       shutil.copyfile(source, actual)
     # Stage the test files in the git index. If they aren't staged, then
@@ skipping 55 matching lines @@
   finally:
     # No matter what, unstage the git changes we made earlier to avoid polluting
     # the index.
     args = ['reset', '--quiet', 'HEAD']
     args.extend(actual_files)
     _RunGit(args)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))