[Page Load Metrics] Add mojom file to page load metrics.

chrome/browser/page_load_metrics/metrics_web_contents_observer_unittest.cc

Index: chrome/browser/page_load_metrics/metrics_web_contents_observer_unittest.cc
diff --git a/chrome/browser/page_load_metrics/metrics_web_contents_observer_unittest.cc b/chrome/browser/page_load_metrics/metrics_web_contents_observer_unittest.cc
index b82829299eed51ffd72fe11b97d9871d1a9adaa5..a6ecc093d40c48190a902df65844d6da1aa53a92 100644
--- a/chrome/browser/page_load_metrics/metrics_web_contents_observer_unittest.cc
+++ b/chrome/browser/page_load_metrics/metrics_web_contents_observer_unittest.cc
@@ -44,9 +44,9 @@ class TestPageLoadMetricsObserver
  public:
   TestPageLoadMetricsObserver(
       content::WebContents* web_contents,
-      std::vector<PageLoadTiming>* updated_timings,
-      std::vector<PageLoadTiming>* updated_subframe_timings,
-      std::vector<PageLoadTiming>* complete_timings,
+      std::vector<mojom::PageLoadTimingPtr>* updated_timings,
+      std::vector<mojom::PageLoadTimingPtr>* updated_subframe_timings,
+      std::vector<mojom::PageLoadTimingPtr>* complete_timings,
       std::vector<GURL>* observed_committed_urls)
       : MetricsWebContentsObserver::TestingObserver(web_contents),
         updated_timings_(updated_timings),
@@ -61,34 +61,34 @@ class TestPageLoadMetricsObserver
     return CONTINUE_OBSERVING;
   }
 
-  void OnTimingUpdate(const PageLoadTiming& timing,
+  void OnTimingUpdate(const mojom::PageLoadTiming& timing,
                       const PageLoadExtraInfo& extra_info) override {
-    updated_timings_->push_back(timing);
+    updated_timings_->push_back(timing.Clone());
   }
 
   void OnTimingUpdated(bool is_main_frame,
-                       const PageLoadTiming& timing,
-                       const PageLoadMetadata& metadata) override {
+                       const mojom::PageLoadTiming& timing,
+                       const mojom::PageLoadMetadata& metadata) override {
     if (!is_main_frame) {
-      updated_subframe_timings_->push_back(timing);
+      updated_subframe_timings_->push_back(timing.Clone());
     }
   }
 
-  void OnComplete(const PageLoadTiming& timing,
+  void OnComplete(const mojom::PageLoadTiming& timing,
                   const PageLoadExtraInfo& extra_info) override {
-    complete_timings_->push_back(timing);
+    complete_timings_->push_back(timing.Clone());
   }
 
   ObservePolicy FlushMetricsOnAppEnterBackground(
-      const PageLoadTiming& timing,
+      const mojom::PageLoadTiming& timing,
       const PageLoadExtraInfo& extra_info) override {
     return STOP_OBSERVING;
   }
 
  private:
-  std::vector<PageLoadTiming>* const updated_timings_;
-  std::vector<PageLoadTiming>* const updated_subframe_timings_;
-  std::vector<PageLoadTiming>* const complete_timings_;
+  std::vector<mojom::PageLoadTimingPtr>* const updated_timings_;
+  std::vector<mojom::PageLoadTimingPtr>* const updated_subframe_timings_;
+  std::vector<mojom::PageLoadTimingPtr>* const complete_timings_;
   std::vector<GURL>* const observed_committed_urls_;
 };
 
@@ -114,7 +114,7 @@ class FilteringPageLoadMetricsObserver : public PageLoadMetricsObserver {
     return should_ignore ? STOP_OBSERVING : CONTINUE_OBSERVING;
   }
 
-  void OnComplete(const PageLoadTiming& timing,
+  void OnComplete(const mojom::PageLoadTiming& timing,
                   const PageLoadExtraInfo& extra_info) override {
     completed_filtered_urls_->push_back(extra_info.url);
   }
@@ -139,13 +139,14 @@ class TestPageLoadMetricsEmbedderInterface
     tracker->AddObserver(base::MakeUnique<FilteringPageLoadMetricsObserver>(
         &completed_filtered_urls_));
   }
-  const std::vector<PageLoadTiming>& updated_timings() const {
+  const std::vector<mojom::PageLoadTimingPtr>& updated_timings() const {
     return updated_timings_;
   }
-  const std::vector<PageLoadTiming>& complete_timings() const {
+  const std::vector<mojom::PageLoadTimingPtr>& complete_timings() const {
     return complete_timings_;
   }
-  const std::vector<PageLoadTiming>& updated_subframe_timings() const {
+  const std::vector<mojom::PageLoadTimingPtr>& updated_subframe_timings()
+      const {
     return updated_subframe_timings_;
   }
 
@@ -160,9 +161,9 @@ class TestPageLoadMetricsEmbedderInterface
   }
 
  private:
-  std::vector<PageLoadTiming> updated_timings_;
-  std::vector<PageLoadTiming> updated_subframe_timings_;
-  std::vector<PageLoadTiming> complete_timings_;
+  std::vector<mojom::PageLoadTimingPtr> updated_timings_;
+  std::vector<mojom::PageLoadTimingPtr> updated_subframe_timings_;
+  std::vector<mojom::PageLoadTimingPtr> complete_timings_;
   std::vector<GURL> observed_committed_urls_;
   std::vector<GURL> completed_filtered_urls_;
   content::WebContents* web_contents_;
@@ -185,13 +186,14 @@ class MetricsWebContentsObserverTest : public ChromeRenderViewHostTestHarness {
         ->NavigateAndCommit(GURL(url::kAboutBlankURL));
   }
 
-  void SimulateTimingUpdate(const PageLoadTiming& timing) {
+  void SimulateTimingUpdate(const mojom::PageLoadTiming& timing) {
     SimulateTimingUpdate(timing, web_contents()->GetMainFrame());
   }
 
-  void SimulateTimingUpdate(const PageLoadTiming& timing,
+  void SimulateTimingUpdate(const mojom::PageLoadTiming& timing,
                             content::RenderFrameHost* render_frame_host) {
-    observer_->OnTimingUpdated(render_frame_host, timing, PageLoadMetadata());
+    observer_->OnTimingUpdated(render_frame_host, timing,
+                               mojom::PageLoadMetadata());
   }
 
   void AttachObserver() {
@@ -222,19 +224,20 @@ class MetricsWebContentsObserverTest : public ChromeRenderViewHostTestHarness {
   int CountEmptyCompleteTimingReported() {
     int empty = 0;
     for (const auto& timing : embedder_interface_->complete_timings()) {
-      if (timing.IsEmpty())
+      if (page_load_metrics::IsEmpty(*timing))
         ++empty;
     }
     return empty;
   }
 
-  const std::vector<PageLoadTiming>& updated_timings() const {
+  const std::vector<mojom::PageLoadTimingPtr>& updated_timings() const {
     return embedder_interface_->updated_timings();
   }
-  const std::vector<PageLoadTiming>& complete_timings() const {
+  const std::vector<mojom::PageLoadTimingPtr>& complete_timings() const {
     return embedder_interface_->complete_timings();
   }
-  const std::vector<PageLoadTiming>& updated_subframe_timings() const {
+  const std::vector<mojom::PageLoadTimingPtr>& updated_subframe_timings()
+      const {
     return embedder_interface_->updated_subframe_timings();
   }
   int CountCompleteTimingReported() { return complete_timings().size(); }
@@ -263,7 +266,8 @@ class MetricsWebContentsObserverTest : public ChromeRenderViewHostTestHarness {
 };
 
 TEST_F(MetricsWebContentsObserverTest, SuccessfulMainFrameNavigation) {
-  PageLoadTiming timing;
+  mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);
 
   content::WebContentsTester* web_contents_tester =
@@ -292,7 +296,8 @@ TEST_F(MetricsWebContentsObserverTest, SuccessfulMainFrameNavigation) {
 }
 
 TEST_F(MetricsWebContentsObserverTest, SubFrame) {
-  PageLoadTiming timing;
+  mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);
 
   content::WebContentsTester* web_contents_tester =
@@ -304,7 +309,8 @@ TEST_F(MetricsWebContentsObserverTest, SubFrame) {
       content::RenderFrameHostTester::For(main_rfh());
   content::RenderFrameHost* subframe = rfh_tester->AppendChild("subframe");
 
-  PageLoadTiming subframe_timing;
+  mojom::PageLoadTiming subframe_timing;
+  page_load_metrics::InitPageLoadTimingForTest(&subframe_timing);
   subframe_timing.navigation_start = base::Time::FromDoubleT(2);
   content::RenderFrameHostTester* subframe_tester =
       content::RenderFrameHostTester::For(subframe);
@@ -319,16 +325,17 @@ TEST_F(MetricsWebContentsObserverTest, SubFrame) {
   ASSERT_EQ(1, CountCompleteTimingReported());
   ASSERT_EQ(1, CountUpdatedTimingReported());
   ASSERT_EQ(0, CountEmptyCompleteTimingReported());
-  EXPECT_EQ(timing, updated_timings().at(0));
+  EXPECT_TRUE(timing.Equals(*updated_timings().at(0)));
 
   ASSERT_EQ(1, CountUpdatedSubFrameTimingReported());
-  EXPECT_EQ(subframe_timing, updated_subframe_timings().at(0));
+  EXPECT_TRUE(subframe_timing.Equals(*updated_subframe_timings().at(0)));
 
   CheckNoErrorEvents();
 }
 
 TEST_F(MetricsWebContentsObserverTest, SameDocumentNoTrigger) {
-  PageLoadTiming timing;
+  mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);
 
   content::WebContentsTester* web_contents_tester =
@@ -358,7 +365,8 @@ TEST_F(MetricsWebContentsObserverTest, SameDocumentNoTrigger) {
 }
 
 TEST_F(MetricsWebContentsObserverTest, DontLogNewTabPage) {
-  PageLoadTiming timing;
+  mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);
 
   content::WebContentsTester* web_contents_tester =
@@ -375,7 +383,8 @@ TEST_F(MetricsWebContentsObserverTest, DontLogNewTabPage) {
 }
 
 TEST_F(MetricsWebContentsObserverTest, DontLogIrrelevantNavigation) {
-  PageLoadTiming timing;
+  mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(10);
 
   content::WebContentsTester* web_contents_tester =
@@ -395,7 +404,8 @@ TEST_F(MetricsWebContentsObserverTest, DontLogIrrelevantNavigation) {
 }
 
 TEST_F(MetricsWebContentsObserverTest, EmptyTimingError) {
-  PageLoadTiming timing;
+  mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
 
   content::WebContentsTester* web_contents_tester =
       content::WebContentsTester::For(web_contents());
@@ -419,8 +429,9 @@ TEST_F(MetricsWebContentsObserverTest, EmptyTimingError) {
 }
 
 TEST_F(MetricsWebContentsObserverTest, NullNavigationStartError) {
-  PageLoadTiming timing;
-  timing.parse_timing.parse_start = base::TimeDelta::FromMilliseconds(1);
+  mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
+  timing.parse_timing->parse_start = base::TimeDelta::FromMilliseconds(1);
 
   content::WebContentsTester* web_contents_tester =
       content::WebContentsTester::For(web_contents());
@@ -444,9 +455,10 @@ TEST_F(MetricsWebContentsObserverTest, NullNavigationStartError) {
 }
 
 TEST_F(MetricsWebContentsObserverTest, TimingOrderError) {
-  PageLoadTiming timing;
+  mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(1);
-  timing.parse_timing.parse_stop = base::TimeDelta::FromMilliseconds(1);
+  timing.parse_timing->parse_stop = base::TimeDelta::FromMilliseconds(1);
 
   content::WebContentsTester* web_contents_tester =
       content::WebContentsTester::For(web_contents());
@@ -470,9 +482,11 @@ TEST_F(MetricsWebContentsObserverTest, TimingOrderError) {
 }
 
 TEST_F(MetricsWebContentsObserverTest, BadIPC) {
-  PageLoadTiming timing;
+  mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(10);
-  PageLoadTiming timing2;
+  mojom::PageLoadTiming timing2;
+  page_load_metrics::InitPageLoadTimingForTest(&timing2);
   timing2.navigation_start = base::Time::FromDoubleT(100);
 
   content::WebContentsTester* web_contents_tester =
@@ -495,7 +509,8 @@ TEST_F(MetricsWebContentsObserverTest, ObservePartialNavigation) {
   DeleteContents();
   SetContents(CreateTestWebContents());
 
-  PageLoadTiming timing;
+  mojom::PageLoadTiming timing;
+  page_load_metrics::InitPageLoadTimingForTest(&timing);
   timing.navigation_start = base::Time::FromDoubleT(10);
 
   content::WebContentsTester* web_contents_tester =