| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/page_load_metrics/observers/core_page_load_metrics_obse
rver.h" | 5 #include "chrome/browser/page_load_metrics/observers/core_page_load_metrics_obse
rver.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_
test_harness.h" | 8 #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_
test_harness.h" |
| 9 #include "chrome/browser/page_load_metrics/page_load_metrics_util.h" | 9 #include "chrome/browser/page_load_metrics/page_load_metrics_util.h" |
| 10 #include "chrome/test/base/testing_browser_process.h" | 10 #include "chrome/test/base/testing_browser_process.h" |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 | 322 |
| 323 web_contents()->WasHidden(); | 323 web_contents()->WasHidden(); |
| 324 | 324 |
| 325 // Open in new tab | 325 // Open in new tab |
| 326 StartNavigation(GURL(kDefaultTestUrl)); | 326 StartNavigation(GURL(kDefaultTestUrl)); |
| 327 | 327 |
| 328 // Switch to the tab | 328 // Switch to the tab |
| 329 web_contents()->WasShown(); | 329 web_contents()->WasShown(); |
| 330 | 330 |
| 331 // Start another provisional load | 331 // Start another provisional load |
| 332 StartNavigation(GURL(kDefaultTestUrl2)); | 332 NavigateAndCommit(GURL(kDefaultTestUrl2)); |
| 333 content::RenderFrameHostTester* rfh_tester = | |
| 334 content::RenderFrameHostTester::For(main_rfh()); | |
| 335 rfh_tester->SimulateNavigationCommit(GURL(kDefaultTestUrl2)); | |
| 336 SimulateTimingUpdate(timing); | 333 SimulateTimingUpdate(timing); |
| 337 rfh_tester->SimulateNavigationStop(); | |
| 338 | 334 |
| 339 // Navigate again to see if the timing updated for the foregrounded load. | 335 // Navigate again to see if the timing updated for the foregrounded load. |
| 340 NavigateAndCommit(GURL(kDefaultTestUrl)); | 336 NavigateAndCommit(GURL(kDefaultTestUrl)); |
| 341 | 337 |
| 342 histogram_tester().ExpectTotalCount(internal::kHistogramCommit, 1); | 338 histogram_tester().ExpectTotalCount(internal::kHistogramCommit, 1); |
| 343 histogram_tester().ExpectTotalCount(internal::kHistogramDomContentLoaded, 0); | 339 histogram_tester().ExpectTotalCount(internal::kHistogramDomContentLoaded, 0); |
| 344 histogram_tester().ExpectTotalCount(internal::kHistogramLoad, 0); | 340 histogram_tester().ExpectTotalCount(internal::kHistogramLoad, 0); |
| 345 histogram_tester().ExpectTotalCount(internal::kHistogramFirstLayout, 1); | 341 histogram_tester().ExpectTotalCount(internal::kHistogramFirstLayout, 1); |
| 346 histogram_tester().ExpectBucketCount(internal::kHistogramFirstLayout, | 342 histogram_tester().ExpectBucketCount(internal::kHistogramFirstLayout, |
| 347 first_layout.InMilliseconds(), 1); | 343 first_layout.InMilliseconds(), 1); |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 545 histogram_tester().ExpectTotalCount( | 541 histogram_tester().ExpectTotalCount( |
| 546 internal::kHistogramLoadTypeParseStartReload, 0); | 542 internal::kHistogramLoadTypeParseStartReload, 0); |
| 547 histogram_tester().ExpectTotalCount( | 543 histogram_tester().ExpectTotalCount( |
| 548 internal::kHistogramLoadTypeParseStartForwardBack, 0); | 544 internal::kHistogramLoadTypeParseStartForwardBack, 0); |
| 549 histogram_tester().ExpectTotalCount( | 545 histogram_tester().ExpectTotalCount( |
| 550 internal::kHistogramLoadTypeParseStartNewNavigation, 1); | 546 internal::kHistogramLoadTypeParseStartNewNavigation, 1); |
| 551 histogram_tester().ExpectBucketCount( | 547 histogram_tester().ExpectBucketCount( |
| 552 internal::kHistogramLoadTypeParseStartNewNavigation, | 548 internal::kHistogramLoadTypeParseStartNewNavigation, |
| 553 timing.parse_start.value().InMilliseconds(), 1); | 549 timing.parse_start.value().InMilliseconds(), 1); |
| 554 } | 550 } |
| OLD | NEW |