[PageLoadMetrics] Keep track of Ad Sizes on Pages

chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer_unittest.cc

 // Copyright 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/browser/page_load_metrics/observers/core_page_load_metrics_observer.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h"
 #include "chrome/browser/page_load_metrics/page_load_metrics_util.h"
 #include "chrome/test/base/testing_browser_process.h"
@@ skipping 399 matching lines @@
   timing.paint_timing.first_contentful_paint =
       base::TimeDelta::FromMilliseconds(10);
   PopulateRequiredTimingFields(&timing);
 
   GURL url(kDefaultTestUrl);
   NavigateWithPageTransitionAndCommit(url, ui::PAGE_TRANSITION_RELOAD);
   SimulateTimingUpdate(timing);
 
   page_load_metrics::ExtraRequestCompleteInfo resources[] = {
       // Cached request.
-      {true /*was_cached*/, 1024 * 20 /* raw_body_bytes */,
-       0 /* original_network_content_length */,
+
+      {GURL(), -1 /* frame_tree_node_id */, true /*was_cached*/,
+       1024 * 20 /* raw_body_bytes */, 0 /* original_network_content_length */,
        nullptr /* data_reduction_proxy_data */,
        content::ResourceType::RESOURCE_TYPE_MAIN_FRAME},
       // Uncached non-proxied request.
-      {false /*was_cached*/, 1024 * 40 /* raw_body_bytes */,
+      {GURL(), -1 /* frame_tree_node_id */, false /*was_cached*/,
+       1024 * 40 /* raw_body_bytes */,
        1024 * 40 /* original_network_content_length */,
        nullptr /* data_reduction_proxy_data */,
        content::ResourceType::RESOURCE_TYPE_MAIN_FRAME},
   };
 
   int64_t network_bytes = 0;
   int64_t cache_bytes = 0;
   for (const auto& request : resources) {
     SimulateLoadedResource(request);
     if (!request.was_cached) {
@@ skipping 62 matching lines @@
   // of PAGE_TRANSITION_RELOAD with a PAGE_TRANSITION_FORWARD_BACK
   // modifier. This test verifies that when we encounter such a page, we log it
   // as a forward/back navigation.
   NavigateWithPageTransitionAndCommit(
       url, ui::PageTransitionFromInt(ui::PAGE_TRANSITION_RELOAD |
                                      ui::PAGE_TRANSITION_FORWARD_BACK));
   SimulateTimingUpdate(timing);
 
   page_load_metrics::ExtraRequestCompleteInfo resources[] = {
       // Cached request.
-      {true /*was_cached*/, 1024 * 20 /* raw_body_bytes */,
-       0 /* original_network_content_length */,
+      {GURL(), -1 /* frame_tree_node_id */, true /*was_cached*/,
+       1024 * 20 /* raw_body_bytes */, 0 /* original_network_content_length */,
        nullptr /* data_reduction_proxy_data */,
        content::ResourceType::RESOURCE_TYPE_MAIN_FRAME},
       // Uncached non-proxied request.
-      {false /*was_cached*/, 1024 * 40 /* raw_body_bytes */,
+      {GURL(), -1 /* frame_tree_node_id */, false /*was_cached*/,
+       1024 * 40 /* raw_body_bytes */,
        1024 * 40 /* original_network_content_length */,
        nullptr /* data_reduction_proxy_data */,
        content::ResourceType::RESOURCE_TYPE_MAIN_FRAME},
   };
 
   int64_t network_bytes = 0;
   int64_t cache_bytes = 0;
   for (const auto& request : resources) {
     SimulateLoadedResource(request);
     if (!request.was_cached) {
@@ skipping 56 matching lines @@
   timing.paint_timing.first_contentful_paint =
       base::TimeDelta::FromMilliseconds(10);
   PopulateRequiredTimingFields(&timing);
 
   GURL url(kDefaultTestUrl);
   NavigateWithPageTransitionAndCommit(url, ui::PAGE_TRANSITION_LINK);
   SimulateTimingUpdate(timing);
 
   page_load_metrics::ExtraRequestCompleteInfo resources[] = {
       // Cached request.
-      {true /*was_cached*/, 1024 * 20 /* raw_body_bytes */,
-       0 /* original_network_content_length */,
+      {GURL(), -1 /* frame_tree_node_id */, true /*was_cached*/,
+       1024 * 20 /* raw_body_bytes */, 0 /* original_network_content_length */,
        nullptr /* data_reduction_proxy_data */,
        content::ResourceType::RESOURCE_TYPE_MAIN_FRAME},
       // Uncached non-proxied request.
-      {false /*was_cached*/, 1024 * 40 /* raw_body_bytes */,
+      {GURL(), -1 /* frame_tree_node_id */, false /*was_cached*/,
+       1024 * 40 /* raw_body_bytes */,
        1024 * 40 /* original_network_content_length */,
        nullptr /* data_reduction_proxy_data */,
        content::ResourceType::RESOURCE_TYPE_MAIN_FRAME},
   };
 
   int64_t network_bytes = 0;
   int64_t cache_bytes = 0;
   for (const auto& request : resources) {
     SimulateLoadedResource(request);
     if (!request.was_cached) {
@@ skipping 107 matching lines @@
   NavigateAndCommit(GURL(kDefaultTestUrl2));
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramFirstMeaningfulPaint, 0);
   histogram_tester().ExpectTotalCount(
       internal::kHistogramParseStartToFirstMeaningfulPaint, 0);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramFirstMeaningfulPaintStatus,
       internal::FIRST_MEANINGFUL_PAINT_USER_INTERACTION_BEFORE_FMP, 1);
 }