commit ed5d5947300f25380ea86491975e2cc4a8d644a6
author Danil Chapovalov <danilchap@webrtc.org> Wed May 27 11:41:34 2020
committer Commit Bot <commit-bot@chromium.org> Thu May 28 14:11:53 2020
tree c9ece912ee721791dfcd8fd6e2a9b48da838b6e4
parent 8edfe6e6670ee1070ea12275fca6da48d4afb73f

Replace mock macros with unified MOCK_METHOD macro

Bug: webrtc:11564
Change-Id: I6398b052ec85d2f739755723629bc5da98fb30e3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176180
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31376}

logging/rtc_event_log/mock/mock_rtc_event_log.h

diff --git a/logging/rtc_event_log/mock/mock_rtc_event_log.h b/logging/rtc_event_log/mock/mock_rtc_event_log.h
index 66a2065..646831d 100644
--- a/logging/rtc_event_log/mock/mock_rtc_event_log.h
+++ b/logging/rtc_event_log/mock/mock_rtc_event_log.h
@@ -21,20 +21,20 @@
 class MockRtcEventLog : public RtcEventLog {
  public:
   MockRtcEventLog();
-  ~MockRtcEventLog();
+  ~MockRtcEventLog() override;
 
-  virtual bool StartLogging(std::unique_ptr<RtcEventLogOutput> output,
-                            int64_t output_period_ms) {
-    return StartLoggingProxy(output.get(), output_period_ms);
-  }
-  MOCK_METHOD2(StartLoggingProxy, bool(RtcEventLogOutput*, int64_t));
+  MOCK_METHOD(bool,
+              StartLogging,
+              (std::unique_ptr<RtcEventLogOutput> output,
+               int64_t output_period_ms),
+              (override));
 
-  MOCK_METHOD0(StopLogging, void());
+  MOCK_METHOD(void, StopLogging, (), (override));
 
-  virtual void Log(std::unique_ptr<RtcEvent> event) {
+  void Log(std::unique_ptr<RtcEvent> event) override {
     return LogProxy(event.get());
   }
-  MOCK_METHOD1(LogProxy, void(RtcEvent*));
+  MOCK_METHOD(void, LogProxy, (RtcEvent*));
 };
 
 }  // namespace webrtc

modules/desktop_capture/mock_desktop_capturer_callback.h

diff --git a/modules/desktop_capture/mock_desktop_capturer_callback.h b/modules/desktop_capture/mock_desktop_capturer_callback.h
index 659239a..6530dc5 100644
--- a/modules/desktop_capture/mock_desktop_capturer_callback.h
+++ b/modules/desktop_capture/mock_desktop_capturer_callback.h
@@ -22,9 +22,10 @@
   MockDesktopCapturerCallback();
   ~MockDesktopCapturerCallback() override;
 
-  MOCK_METHOD2(OnCaptureResultPtr,
-               void(DesktopCapturer::Result result,
-                    std::unique_ptr<DesktopFrame>* frame));
+  MOCK_METHOD(void,
+              OnCaptureResultPtr,
+              (DesktopCapturer::Result result,
+               std::unique_ptr<DesktopFrame>* frame));
   void OnCaptureResult(DesktopCapturer::Result result,
                        std::unique_ptr<DesktopFrame> frame) final;
 

modules/utility/source/process_thread_impl_unittest.cc

diff --git a/modules/utility/source/process_thread_impl_unittest.cc b/modules/utility/source/process_thread_impl_unittest.cc
index 6f76536..1fef0b6 100644
--- a/modules/utility/source/process_thread_impl_unittest.cc
+++ b/modules/utility/source/process_thread_impl_unittest.cc
@@ -37,9 +37,9 @@
 
 class MockModule : public Module {
  public:
-  MOCK_METHOD0(TimeUntilNextProcess, int64_t());
-  MOCK_METHOD0(Process, void());
-  MOCK_METHOD1(ProcessThreadAttached, void(ProcessThread*));
+  MOCK_METHOD(int64_t, TimeUntilNextProcess, (), (override));
+  MOCK_METHOD(void, Process, (), (override));
+  MOCK_METHOD(void, ProcessThreadAttached, (ProcessThread*), (override));
 };
 
 class RaiseEventTask : public QueuedTask {