[Page Load Metrics] Structure PageLoadTiming.

chrome/renderer/page_load_metrics/metrics_render_frame_observer_unittest.cc

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/page_load_metrics/metrics_render_frame_observer.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
@@ skipping 84 matching lines @@
   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;
   observer.ExpectPageLoadTiming(timing);
   observer.DidCommitProvisionalLoad(true, false);
   mock_timer->Fire();
 
-  timing.first_layout = first_layout;
+  timing.document_timing.first_layout = first_layout;
   observer.ExpectPageLoadTiming(timing);
 
   observer.DidChangePerformanceTiming();
   mock_timer->Fire();
 }
 
 TEST_F(MetricsRenderFrameObserverTest, MultipleMetrics) {
   base::Time nav_start = base::Time::FromDoubleT(10);
   base::TimeDelta first_layout = base::TimeDelta::FromMillisecondsD(2);
   base::TimeDelta dom_event = base::TimeDelta::FromMillisecondsD(2);
   base::TimeDelta load_event = base::TimeDelta::FromMillisecondsD(2);
 
   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;
   observer.ExpectPageLoadTiming(timing);
   observer.DidCommitProvisionalLoad(true, false);
   mock_timer->Fire();
 
-  timing.first_layout = first_layout;
-  timing.dom_content_loaded_event_start = dom_event;
+  timing.document_timing.first_layout = first_layout;
+  timing.document_timing.dom_content_loaded_event_start = dom_event;
   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.
   observer.VerifyExpectedTimings();
 
-  timing.load_event_start = load_event;
+  timing.document_timing.load_event_start = load_event;
   observer.ExpectPageLoadTiming(timing);
 
   observer.DidChangePerformanceTiming();
   mock_timer->Fire();
 
   // Verify and reset the observer's expectations before moving on to the next
   // part of the test.
   observer.VerifyExpectedTimings();
 
   // The PageLoadTiming above includes timing information for the first layout,
@@ skipping 13 matching lines @@
   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;
   observer.ExpectPageLoadTiming(timing);
   observer.DidCommitProvisionalLoad(true, false);
   mock_timer->Fire();
 
-  timing.first_layout = first_layout;
-  timing.dom_content_loaded_event_start = dom_event;
-  timing.load_event_start = load_event;
+  timing.document_timing.first_layout = first_layout;
+  timing.document_timing.dom_content_loaded_event_start = dom_event;
+  timing.document_timing.load_event_start = load_event;
   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.
   observer.VerifyExpectedTimings();
 
   base::Time nav_start_2 = base::Time::FromDoubleT(100);
   base::TimeDelta first_layout_2 = base::TimeDelta::FromMillisecondsD(20);
   base::TimeDelta dom_event_2 = base::TimeDelta::FromMillisecondsD(20);
   base::TimeDelta load_event_2 = base::TimeDelta::FromMillisecondsD(20);
   PageLoadTiming timing_2;
   timing_2.navigation_start = nav_start_2;
 
   base::MockTimer* mock_timer2 = new base::MockTimer(false, false);
   observer.set_mock_timer(base::WrapUnique(mock_timer2));
 
   observer.ExpectPageLoadTiming(timing_2);
   observer.DidCommitProvisionalLoad(true, false);
   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;
+  timing_2.document_timing.first_layout = first_layout_2;
+  timing_2.document_timing.dom_content_loaded_event_start = dom_event_2;
+  timing_2.document_timing.load_event_start = load_event_2;
   observer.ExpectPageLoadTiming(timing_2);
 
   observer.DidChangePerformanceTiming();
   mock_timer2->Fire();
 }
 
 TEST_F(MetricsRenderFrameObserverTest, NoUpdatesFromChildFrames) {
   base::Time nav_start = base::Time::FromDoubleT(10);
 
   TestMetricsRenderFrameObserver observer;
   base::MockTimer* mock_timer = new base::MockTimer(false, false);
   observer.set_mock_timer(base::WrapUnique(mock_timer));
   observer.set_is_main_frame(false);
 
   PageLoadTiming timing;
   timing.navigation_start = nav_start;
   observer.SetFakePageLoadTiming(timing);
   observer.DidCommitProvisionalLoad(true, false);
   ASSERT_FALSE(observer.WasFakeTimingConsumed());
   ASSERT_FALSE(mock_timer->IsRunning());
 
   observer.DidChangePerformanceTiming();
   ASSERT_FALSE(observer.WasFakeTimingConsumed());
   ASSERT_FALSE(mock_timer->IsRunning());
 }
 
 }  // namespace page_load_metrics