Also handle renaming method names inside ON_CALL macro calls.

tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp

 // Copyright 2015 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.
 //
 // Changes Blink-style names to Chrome-style names. Currently transforms:
 //   fields:
 //     int m_operationCount => int operation_count_
 //   variables (including parameters):
 //     int mySuperVariable => int my_super_variable
 //   constants:
@@ skipping 1196 matching lines @@
 
   std::unique_ptr<clang::PPCallbacks> CreatePreprocessorCallbacks() {
     return llvm::make_unique<GMockMemberRewriter::PPCallbacks>(this);
   }
 
   clang::SourceLocation GetTargetLoc(
       const MatchFinder::MatchResult& result) override {
     // Find location of the gmock_##MockedMethod identifier.
     clang::SourceLocation target_loc = Base::GetTargetLoc(result);
 
-    // Find location of EXPECT_CALL macro invocation.
+    // Find location of EXPECT_CALL or ON_CALL macro invocation.
     clang::SourceLocation macro_call_loc =
         result.SourceManager->getExpansionLoc(target_loc);
 
     // Map |macro_call_loc| to argument location (location of the method name
     // that needs renaming).
-    auto it = expect_call_to_2nd_arg.find(macro_call_loc);
-    if (it == expect_call_to_2nd_arg.end())
+    auto it = gmock_macro_call_to_2nd_arg.find(macro_call_loc);
+    if (it == gmock_macro_call_to_2nd_arg.end())
       return clang::SourceLocation();
     return it->second;
   }
 
  private:
-  std::map<clang::SourceLocation, clang::SourceLocation> expect_call_to_2nd_arg;
+  std::map<clang::SourceLocation, clang::SourceLocation>
+      gmock_macro_call_to_2nd_arg;
 
-  // Called from PPCallbacks with the locations of EXPECT_CALL macro invocation:
-  // Example:
+  // Called from PPCallbacks with the locations of EXPECT_CALL and ON_CALL macro
+  // invocation.  Example:
   //   EXPECT_CALL(my_mock, myMethod(123, 456));
   //   ^- expansion_loc     ^- actual_arg_loc
-  void RecordExpectCallMacroInvocation(clang::SourceLocation expansion_loc,
-                                       clang::SourceLocation second_arg_loc) {
-    expect_call_to_2nd_arg[expansion_loc] = second_arg_loc;
+  void RecordGMockMacroInvocation(clang::SourceLocation expansion_loc,
+                                  clang::SourceLocation second_arg_loc) {
+    gmock_macro_call_to_2nd_arg[expansion_loc] = second_arg_loc;
   }
 
   class PPCallbacks : public clang::PPCallbacks {
    public:
     explicit PPCallbacks(GMockMemberRewriter* rewriter) : rewriter_(rewriter) {}
     ~PPCallbacks() override {}
     void MacroExpands(const clang::Token& name,
                       const clang::MacroDefinition& def,
                       clang::SourceRange range,
                       const clang::MacroArgs* args) override {
       clang::IdentifierInfo* id = name.getIdentifierInfo();
       if (!id)
         return;
 
-      if (id->getName() != "EXPECT_CALL")
+      if (id->getName() != "EXPECT_CALL" && id->getName() != "ON_CALL")
         return;
 
       if (def.getMacroInfo()->getNumArgs() != 2)
         return;
 
       // TODO(lukasza): Should check if def.getMacroInfo()->getDefinitionLoc()
       // is in testing/gmock/include/gmock/gmock-spec-builders.h but I don't
       // know how to get clang::SourceManager to call getFileName.
 
-      rewriter_->RecordExpectCallMacroInvocation(
+      rewriter_->RecordGMockMacroInvocation(
           name.getLocation(), args->getUnexpArgument(1)->getLocation());
     }
 
    private:
     GMockMemberRewriter* rewriter_;
   };
 };
 
 clang::DeclarationName GetUnresolvedName(
     const clang::UnresolvedMemberExpr& expr) {
@@ skipping 537 matching lines @@
       expr(id("expr", cxxDependentScopeMemberExpr(
                           hasMemberFromType(blink_qual_type_matcher))));
   CXXDependentScopeMemberExprRewriter cxx_dependent_scope_member_expr_rewriter(
       &replacements);
   match_finder.addMatcher(cxx_dependent_scope_member_expr_matcher,
                           &cxx_dependent_scope_member_expr_rewriter);
 
   // GMock calls lookup ========
   // Given
   //   EXPECT_CALL(obj, myMethod(...))
-  // will match obj.gmock_myMethod(...) call generated by the macro
+  // or
+  //   ON_CALL(obj, myMethod(...))
+  // will match obj.gmock_myMethod(...) call generated by the macros
   // (but only if it mocks a Blink method).
   auto gmock_member_matcher =
       id("expr", memberExpr(hasDeclaration(
                      decl(cxxMethodDecl(mocksMethod(method_decl_matcher))))));
   GMockMemberRewriter gmock_member_rewriter(&replacements);
   match_finder.addMatcher(gmock_member_matcher, &gmock_member_rewriter);
 
   // Prepare and run the tool.
   SourceFileCallbacks source_file_callbacks(&gmock_member_rewriter);
   std::unique_ptr<clang::tooling::FrontendActionFactory> factory =
@@ skipping 18 matching lines @@
   for (const auto& r : replacements) {
     std::string replacement_text = r.getReplacementText().str();
     std::replace(replacement_text.begin(), replacement_text.end(), '\n', '\0');
     llvm::outs() << "r:::" << r.getFilePath() << ":::" << r.getOffset()
                  << ":::" << r.getLength() << ":::" << replacement_text << "\n";
   }
   llvm::outs() << "==== END EDITS ====\n";
 
   return 0;
 }