Convert pdf/ to use MOCK_METHOD()

Now that crbug.com/989095 has been fixed, converts all uses of the
legacy MOCK_METHOD*() macros to use the modern MOCK_METHOD() instead.

Change-Id: Id22b3b4e8a0176ac17d9ef263ebe9eb87f558a6b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1934608
Auto-Submit: K. Moon <kmoon@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790269}

pdf/document_loader_impl_unittest.cc

@@ -256,10 +256,10 @@ class MockClient : public TestClient {
  public:
   MockClient() = default;
 
-  MOCK_METHOD0(OnPendingRequestComplete, void());
-  MOCK_METHOD0(OnNewDataReceived, void());
-  MOCK_METHOD0(OnDocumentComplete, void());
-  MOCK_METHOD0(OnDocumentCanceled, void());
+  MOCK_METHOD(void, OnPendingRequestComplete, (), (override));
+  MOCK_METHOD(void, OnNewDataReceived, (), (override));
+  MOCK_METHOD(void, OnDocumentComplete, (), (override));
+  MOCK_METHOD(void, OnDocumentCanceled, (), (override));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockClient);

pdf/pdfium/findtext_unittest.cc

@@ -22,8 +22,8 @@ class FindTextTestClient : public TestClient {
   ~FindTextTestClient() override = default;
 
   // PDFEngine::Client:
-  MOCK_METHOD2(NotifyNumberOfFindResultsChanged, void(int, bool));
-  MOCK_METHOD1(NotifySelectedFindResultChanged, void((int)));
+  MOCK_METHOD(void, NotifyNumberOfFindResultsChanged, (int, bool), (override));
+  MOCK_METHOD(void, NotifySelectedFindResultChanged, (int), (override));
 
   std::vector<SearchStringResult> SearchString(const base::char16* string,
                                                const base::char16* term,

pdf/pdfium/pdfium_engine_unittest.cc

@@ -47,9 +47,11 @@ class MockTestClient : public TestClient {
         });
   }
 
-  // TODO(crbug.com/989095): MOCK_METHOD() triggers static_assert on Windows.
-  MOCK_METHOD1(ProposeDocumentLayout, void(const DocumentLayout& layout));
-  MOCK_METHOD1(ScrollToPage, void(int page));
+  MOCK_METHOD(void,
+              ProposeDocumentLayout,
+              (const DocumentLayout& layout),
+              (override));
+  MOCK_METHOD(void, ScrollToPage, (int page), (override));
 };
 
 class PDFiumEngineTest : public PDFiumTestBase {
@@ -309,7 +311,7 @@ class TabbingTestClient : public TestClient {
   TabbingTestClient& operator=(const TabbingTestClient&) = delete;
 
   // Mock PDFEngine::Client methods.
-  MOCK_METHOD1(DocumentFocusChanged, void(bool));
+  MOCK_METHOD(void, DocumentFocusChanged, (bool), (override));
 };
 
 class PDFiumEngineTabbingTest : public PDFiumTestBase {
@@ -838,8 +840,8 @@ class ScrollingTestClient : public TestClient {
   ScrollingTestClient& operator=(const ScrollingTestClient&) = delete;
 
   // Mock PDFEngine::Client methods.
-  MOCK_METHOD1(ScrollToX, void(int));
-  MOCK_METHOD2(ScrollToY, void(int, bool));
+  MOCK_METHOD(void, ScrollToX, (int), (override));
+  MOCK_METHOD(void, ScrollToY, (int, bool), (override));
 };
 
 TEST_F(PDFiumEngineTabbingTest, MaintainViewportWhenFocusIsUpdated) {

pdf/pdfium/pdfium_form_filler_unittest.cc

@@ -24,9 +24,12 @@ class FormFillerTestClient : public TestClient {
   FormFillerTestClient& operator=(const FormFillerTestClient&) = delete;
 
   // Mock PDFEngine::Client methods.
-  MOCK_METHOD1(ScrollToX, void(int));
-  MOCK_METHOD2(ScrollToY, void(int, bool));
-  MOCK_METHOD2(NavigateTo, void(const std::string&, WindowOpenDisposition));
+  MOCK_METHOD(void, ScrollToX, (int), (override));
+  MOCK_METHOD(void, ScrollToY, (int, bool), (override));
+  MOCK_METHOD(void,
+              NavigateTo,
+              (const std::string&, WindowOpenDisposition),
+              (override));
 };
 
 }  // namespace
@@ -156,4 +159,4 @@ TEST_F(FormFillerTest, FormOnFocusChange) {
   }
 }
 
-}  // namespace chrome_pdf
\ No newline at end of file
+}  // namespace chrome_pdf