Plumb experiment flags through page_load_metrics and add a new observer

components/page_load_metrics/renderer/page_timing_metrics_sender_unittest.cc

Index: components/page_load_metrics/renderer/page_timing_metrics_sender_unittest.cc
diff --git a/components/page_load_metrics/renderer/page_timing_metrics_sender_unittest.cc b/components/page_load_metrics/renderer/page_timing_metrics_sender_unittest.cc
index a424b9b3a892b46366d1326a9a4ff66103a84d75..09d6a186e290c341bf9ec76d8c1e1f0f0ea780ff 100644
--- a/components/page_load_metrics/renderer/page_timing_metrics_sender_unittest.cc
+++ b/components/page_load_metrics/renderer/page_timing_metrics_sender_unittest.cc
@@ -28,7 +28,7 @@ class MockIPCSender : public IPC::Sender {
     return true;
   }
 
-  MOCK_METHOD1(OnTimingUpdated, void(PageLoadTiming));
+  MOCK_METHOD2(OnTimingUpdated, void(PageLoadTiming, PageLoadMetadata));
 };
 
 // Thin wrapper around PageTimingMetricsSender that provides access to the
@@ -66,7 +66,7 @@ TEST_F(PageTimingMetricsSenderTest, Basic) {
   metrics_sender_.Send(timing);
 
   // Firing the timer should trigger sending of an OnTimingUpdated IPC.
-  EXPECT_CALL(mock_ipc_sender_, OnTimingUpdated(timing));
+  EXPECT_CALL(mock_ipc_sender_, OnTimingUpdated(timing, PageLoadMetadata()));
   ASSERT_TRUE(metrics_sender_.mock_timer()->IsRunning());
   metrics_sender_.mock_timer()->Fire();
   EXPECT_FALSE(metrics_sender_.mock_timer()->IsRunning());
@@ -99,7 +99,7 @@ TEST_F(PageTimingMetricsSenderTest, CoalesceMultipleIPCs) {
 
   // Firing the timer should trigger sending of the OnTimingUpdated IPC with
   // the most recently provided PageLoadTiming instance.
-  EXPECT_CALL(mock_ipc_sender_, OnTimingUpdated(timing));
+  EXPECT_CALL(mock_ipc_sender_, OnTimingUpdated(timing, PageLoadMetadata()));
   metrics_sender_.mock_timer()->Fire();
   EXPECT_FALSE(metrics_sender_.mock_timer()->IsRunning());
 }
@@ -115,7 +115,7 @@ TEST_F(PageTimingMetricsSenderTest, MultipleIPCs) {
 
   metrics_sender_.Send(timing);
   ASSERT_TRUE(metrics_sender_.mock_timer()->IsRunning());
-  EXPECT_CALL(mock_ipc_sender_, OnTimingUpdated(timing));
+  EXPECT_CALL(mock_ipc_sender_, OnTimingUpdated(timing, PageLoadMetadata()));
   metrics_sender_.mock_timer()->Fire();
   EXPECT_FALSE(metrics_sender_.mock_timer()->IsRunning());
   testing::Mock::VerifyAndClearExpectations(&mock_ipc_sender_);
@@ -125,7 +125,7 @@ TEST_F(PageTimingMetricsSenderTest, MultipleIPCs) {
   timing.load_event_start = load_event;
   metrics_sender_.Send(timing);
   ASSERT_TRUE(metrics_sender_.mock_timer()->IsRunning());
-  EXPECT_CALL(mock_ipc_sender_, OnTimingUpdated(timing));
+  EXPECT_CALL(mock_ipc_sender_, OnTimingUpdated(timing, PageLoadMetadata()));
   metrics_sender_.mock_timer()->Fire();
   EXPECT_FALSE(metrics_sender_.mock_timer()->IsRunning());
 }
@@ -140,7 +140,7 @@ TEST_F(PageTimingMetricsSenderTest, SendIPCOnDestructor) {
     TestPageTimingMetricsSender sender(&mock_ipc_sender_);
 
     sender.Send(timing);
-    EXPECT_CALL(mock_ipc_sender_, OnTimingUpdated(timing));
+    EXPECT_CALL(mock_ipc_sender_, OnTimingUpdated(timing, PageLoadMetadata()));
     ASSERT_TRUE(sender.mock_timer()->IsRunning());
   }
 }