PageLoadTiming fixes in prep for using base::Optional

components/page_load_metrics/renderer/metrics_render_frame_observer_unittest.cc

Index: components/page_load_metrics/renderer/metrics_render_frame_observer_unittest.cc
diff --git a/components/page_load_metrics/renderer/metrics_render_frame_observer_unittest.cc b/components/page_load_metrics/renderer/metrics_render_frame_observer_unittest.cc
index f0075712da68ca87e6e5246b8da41370e933c767..7ef1d3922365eeb0cd8239aef52c32c86d793155 100644
--- a/components/page_load_metrics/renderer/metrics_render_frame_observer_unittest.cc
+++ b/components/page_load_metrics/renderer/metrics_render_frame_observer_unittest.cc
@@ -10,41 +10,18 @@
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "base/timer/mock_timer.h"
-#include "components/page_load_metrics/common/page_load_metrics_messages.h"
 #include "components/page_load_metrics/common/page_load_timing.h"
-#include "ipc/ipc_message_macros.h"
-#include "testing/gmock/include/gmock/gmock.h"
+#include "components/page_load_metrics/renderer/fake_page_timing_metrics_ipc_sender.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using testing::NiceMock;
-using testing::Return;
-using testing::StrictMock;
-
 namespace page_load_metrics {
 
-// IPC interceptor class, which we use to verify that certain IPC
-// messages get sent.
-class MockIPCInterceptor {
- public:
-  void OnMessage(const IPC::Message& message) {
-    IPC_BEGIN_MESSAGE_MAP(MockIPCInterceptor, message)
-      IPC_MESSAGE_HANDLER(PageLoadMetricsMsg_TimingUpdated, OnTimingUpdated)
-      IPC_MESSAGE_UNHANDLED(ADD_FAILURE())
-    IPC_END_MESSAGE_MAP()
-  }
-
-  MOCK_METHOD2(OnTimingUpdated, void(PageLoadTiming, PageLoadMetadata));
-};
-
 // Implementation of the MetricsRenderFrameObserver class we're testing,
 // with the GetTiming() and ShouldSendMetrics() methods stubbed out to make
 // the rest of the class more testable.
-class MockMetricsRenderFrameObserver : public MetricsRenderFrameObserver {
+class TestMetricsRenderFrameObserver : public MetricsRenderFrameObserver {
  public:
-  MockMetricsRenderFrameObserver() : MetricsRenderFrameObserver(nullptr) {
-    ON_CALL(*this, ShouldSendMetrics()).WillByDefault(Return(true));
-    ON_CALL(*this, HasNoRenderFrame()).WillByDefault(Return(false));
-  }
+  TestMetricsRenderFrameObserver() : MetricsRenderFrameObserver(nullptr) {}
 
   std::unique_ptr<base::Timer> CreateTimer() const override {
     if (!mock_timer_)
@@ -52,12 +29,11 @@ class MockMetricsRenderFrameObserver : public MetricsRenderFrameObserver {
     return std::move(mock_timer_);
   }
 
-  // We intercept sent messages and dispatch them to a MockIPCInterceptor, which
-  // we use to verify that the expected IPC messages get sent.
-  virtual bool Send(IPC::Message* message) {
-    interceptor_.OnMessage(*message);
-    delete message;
-    return true;
+  // We intercept sent messages and dispatch them to our
+  // FakePageTimingMetricsIPCSender, which we use to verify that the expected
+  // IPC messages get sent.
+  bool Send(IPC::Message* message) override {
+    return fake_timing_ipc_sender_.Send(message);
   }
 
   void set_mock_timer(std::unique_ptr<base::Timer> timer) {
@@ -65,25 +41,35 @@ class MockMetricsRenderFrameObserver : public MetricsRenderFrameObserver {
     mock_timer_ = std::move(timer);
   }
 
-  MOCK_CONST_METHOD0(GetTiming, PageLoadTiming());
-  MOCK_CONST_METHOD0(ShouldSendMetrics, bool());
-  MOCK_CONST_METHOD0(HasNoRenderFrame, bool());
-  MockIPCInterceptor* ipc_interceptor() { return &interceptor_; }
+  void ExpectPageLoadTiming(const PageLoadTiming& timing) {
+    fake_timing_ipc_sender_.ExpectPageLoadTiming(timing);
+  }
+
+  PageLoadTiming GetTiming() const override {
+    return fake_timing_ipc_sender_.expected_timings().empty()
+               ? PageLoadTiming()
+               : fake_timing_ipc_sender_.expected_timings().back();
+  }
+
+  void VerifyExpectedTimings() const {
+    fake_timing_ipc_sender_.VerifyExpectedTimings();
+  }
+
+  bool ShouldSendMetrics() const override { return true; }
+  bool HasNoRenderFrame() const override { return false; }
 
  private:
-  StrictMock<MockIPCInterceptor> interceptor_;
+  FakePageTimingMetricsIPCSender fake_timing_ipc_sender_;
   mutable std::unique_ptr<base::Timer> mock_timer_;
 };
 
 typedef testing::Test MetricsRenderFrameObserverTest;
 
 TEST_F(MetricsRenderFrameObserverTest, NoMetrics) {
-  NiceMock<MockMetricsRenderFrameObserver> observer;
+  TestMetricsRenderFrameObserver observer;
   base::MockTimer* mock_timer = new base::MockTimer(false, false);
   observer.set_mock_timer(base::WrapUnique(mock_timer));
 
-  EXPECT_CALL(observer, GetTiming()).WillRepeatedly(Return(PageLoadTiming()));
-
   observer.DidChangePerformanceTiming();
   ASSERT_FALSE(mock_timer->IsRunning());
 }
@@ -92,23 +78,18 @@ TEST_F(MetricsRenderFrameObserverTest, SingleMetric) {
   base::Time nav_start = base::Time::FromDoubleT(10);
   base::TimeDelta first_layout = base::TimeDelta::FromMillisecondsD(10);
 
-  NiceMock<MockMetricsRenderFrameObserver> observer;
+  TestMetricsRenderFrameObserver observer;
   base::MockTimer* mock_timer = new base::MockTimer(false, false);
   observer.set_mock_timer(base::WrapUnique(mock_timer));
 
   PageLoadTiming timing;
   timing.navigation_start = nav_start;
-  EXPECT_CALL(observer, GetTiming()).WillRepeatedly(Return(timing));
+  observer.ExpectPageLoadTiming(timing);
   observer.DidCommitProvisionalLoad(true, false);
-  EXPECT_CALL(*observer.ipc_interceptor(),
-              OnTimingUpdated(timing, PageLoadMetadata()));
   mock_timer->Fire();
 
   timing.first_layout = first_layout;
-  EXPECT_CALL(observer, GetTiming()).WillRepeatedly(Return(timing));
-
-  EXPECT_CALL(*observer.ipc_interceptor(),
-              OnTimingUpdated(timing, PageLoadMetadata()));
+  observer.ExpectPageLoadTiming(timing);
 
   observer.DidChangePerformanceTiming();
   mock_timer->Fire();
@@ -120,43 +101,37 @@ TEST_F(MetricsRenderFrameObserverTest, MultipleMetrics) {
   base::TimeDelta dom_event = base::TimeDelta::FromMillisecondsD(2);
   base::TimeDelta load_event = base::TimeDelta::FromMillisecondsD(2);
 
-  NiceMock<MockMetricsRenderFrameObserver> observer;
+  TestMetricsRenderFrameObserver observer;
   base::MockTimer* mock_timer = new base::MockTimer(false, false);
   observer.set_mock_timer(base::WrapUnique(mock_timer));
 
   PageLoadTiming timing;
   timing.navigation_start = nav_start;
-  EXPECT_CALL(observer, GetTiming()).WillRepeatedly(Return(timing));
+  observer.ExpectPageLoadTiming(timing);
   observer.DidCommitProvisionalLoad(true, false);
-  EXPECT_CALL(*observer.ipc_interceptor(),
-              OnTimingUpdated(timing, PageLoadMetadata()));
   mock_timer->Fire();
 
   timing.first_layout = first_layout;
   timing.dom_content_loaded_event_start = dom_event;
-  EXPECT_CALL(observer, GetTiming()).WillRepeatedly(Return(timing));
+  observer.ExpectPageLoadTiming(timing);
 
-  EXPECT_CALL(*observer.ipc_interceptor(),
-              OnTimingUpdated(timing, PageLoadMetadata()));
   observer.DidChangePerformanceTiming();
   mock_timer->Fire();
 
   // At this point, we should have triggered the generation of two metrics.
   // Verify and reset the observer's expectations before moving on to the next
   // part of the test.
-  testing::Mock::VerifyAndClearExpectations(observer.ipc_interceptor());
+  observer.VerifyExpectedTimings();
 
   timing.load_event_start = load_event;
-  EXPECT_CALL(observer, GetTiming()).WillRepeatedly(Return(timing));
+  observer.ExpectPageLoadTiming(timing);
 
-  EXPECT_CALL(*observer.ipc_interceptor(),
-              OnTimingUpdated(timing, PageLoadMetadata()));
   observer.DidChangePerformanceTiming();
   mock_timer->Fire();
 
   // Verify and reset the observer's expectations before moving on to the next
   // part of the test.
-  testing::Mock::VerifyAndClearExpectations(observer.ipc_interceptor());
+  observer.VerifyExpectedTimings();
 
   // The PageLoadTiming above includes timing information for the first layout,
   // dom content, and load metrics. However, since we've already generated
@@ -172,31 +147,27 @@ TEST_F(MetricsRenderFrameObserverTest, MultipleNavigations) {
   base::TimeDelta dom_event = base::TimeDelta::FromMillisecondsD(2);
   base::TimeDelta load_event = base::TimeDelta::FromMillisecondsD(2);
 
-  NiceMock<MockMetricsRenderFrameObserver> observer;
+  TestMetricsRenderFrameObserver observer;
   base::MockTimer* mock_timer = new base::MockTimer(false, false);
   observer.set_mock_timer(base::WrapUnique(mock_timer));
 
   PageLoadTiming timing;
   timing.navigation_start = nav_start;
-  EXPECT_CALL(observer, GetTiming()).WillRepeatedly(Return(timing));
+  observer.ExpectPageLoadTiming(timing);
   observer.DidCommitProvisionalLoad(true, false);
-  EXPECT_CALL(*observer.ipc_interceptor(),
-              OnTimingUpdated(timing, PageLoadMetadata()));
   mock_timer->Fire();
 
   timing.first_layout = first_layout;
   timing.dom_content_loaded_event_start = dom_event;
   timing.load_event_start = load_event;
-  EXPECT_CALL(observer, GetTiming()).WillRepeatedly(Return(timing));
-  EXPECT_CALL(*observer.ipc_interceptor(),
-              OnTimingUpdated(timing, PageLoadMetadata()));
+  observer.ExpectPageLoadTiming(timing);
   observer.DidChangePerformanceTiming();
   mock_timer->Fire();
 
   // At this point, we should have triggered the generation of two metrics.
   // Verify and reset the observer's expectations before moving on to the next
   // part of the test.
-  testing::Mock::VerifyAndClearExpectations(observer.ipc_interceptor());
+  observer.VerifyExpectedTimings();
 
   base::Time nav_start_2 = base::Time::FromDoubleT(100);
   base::TimeDelta first_layout_2 = base::TimeDelta::FromMillisecondsD(20);
@@ -208,19 +179,15 @@ TEST_F(MetricsRenderFrameObserverTest, MultipleNavigations) {
   base::MockTimer* mock_timer2 = new base::MockTimer(false, false);
   observer.set_mock_timer(base::WrapUnique(mock_timer2));
 
-  EXPECT_CALL(observer, GetTiming()).WillRepeatedly(Return(timing_2));
+  observer.ExpectPageLoadTiming(timing_2);
   observer.DidCommitProvisionalLoad(true, false);
-  EXPECT_CALL(*observer.ipc_interceptor(),
-              OnTimingUpdated(timing_2, PageLoadMetadata()));
   mock_timer2->Fire();
 
   timing_2.first_layout = first_layout_2;
   timing_2.dom_content_loaded_event_start = dom_event_2;
   timing_2.load_event_start = load_event_2;
-  EXPECT_CALL(observer, GetTiming()).WillRepeatedly(Return(timing_2));
+  observer.ExpectPageLoadTiming(timing_2);
 
-  EXPECT_CALL(*observer.ipc_interceptor(),
-              OnTimingUpdated(timing_2, PageLoadMetadata()));
   observer.DidChangePerformanceTiming();
   mock_timer2->Fire();
 }