Revert "[PageLoadMetrics] Keep track of Ad Sizes on Pages"

chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc

 // Copyright 2017 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/subresource_filter_metrics_observer.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h"
 
 namespace {
@@ skipping 135 matching lines @@
           .InMilliseconds(),
       1);
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramSubresourceFilterForegroundDuration, 1);
 }
 
 TEST_F(SubresourceFilterMetricsObserverTest, Subresources) {
   NavigateAndCommit(GURL(kDefaultTestUrl));
 
-  SimulateLoadedResource(
-      {GURL(), -1 /* frame_tree_node_id */, false /* was_cached */,
-       1024 * 40 /* raw_body_bytes */, 0 /* original_network_content_length */,
-       nullptr /* data_reduction_proxy_data */,
-       content::ResourceType::RESOURCE_TYPE_MAIN_FRAME});
+  SimulateLoadedResource({false /* was_cached */,
+                          1024 * 40 /* raw_body_bytes */,
+                          0 /* original_network_content_length */,
+                          nullptr /* data_reduction_proxy_data */,
+                          content::ResourceType::RESOURCE_TYPE_MAIN_FRAME});
 
   page_load_metrics::PageLoadTiming timing;
   timing.navigation_start = base::Time::FromDoubleT(1);
   page_load_metrics::PageLoadMetadata metadata;
   metadata.behavior_flags |=
       blink::WebLoadingBehaviorFlag::kWebLoadingBehaviorSubresourceFilterMatch;
   SimulateTimingAndMetadataUpdate(timing, metadata);
 
-  SimulateLoadedResource(
-      {GURL(), -1 /* frame_tree_node_id */, false /* was_cached */,
-       1024 * 20 /* raw_body_bytes */, 0 /* original_network_content_length */,
-       nullptr /* data_reduction_proxy_data */,
-       content::ResourceType::RESOURCE_TYPE_MAIN_FRAME});
-
-  SimulateLoadedResource({GURL(), -1 /* frame_tree_node_id */,
-                          true /* was_cached */, 1024 * 10 /* raw_body_bytes */,
+  SimulateLoadedResource({false /* was_cached */,
+                          1024 * 20 /* raw_body_bytes */,
                           0 /* original_network_content_length */,
                           nullptr /* data_reduction_proxy_data */,
                           content::ResourceType::RESOURCE_TYPE_MAIN_FRAME});
+
+  SimulateLoadedResource({true /* was_cached */, 1024 * 10 /* raw_body_bytes */,
+                          0 /* original_network_content_length */,
+                          nullptr /* data_reduction_proxy_data */,
+                          content::ResourceType::RESOURCE_TYPE_MAIN_FRAME});
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramSubresourceFilterCount, 1);
 
   // Navigate away from the current page to force logging of request and byte
   // metrics.
   NavigateToUntrackedUrl();
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramSubresourceFilterTotalResources, 1);
@@ skipping 55 matching lines @@
       internal::kHistogramSubresourceFilterNoMediaCacheBytes, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterNoMediaCacheBytes, 10, 1);
 }
 
 TEST_F(SubresourceFilterMetricsObserverTest, SubresourcesWithMedia) {
   NavigateAndCommit(GURL(kDefaultTestUrl));
 
   SimulateMediaPlayed();
 
-  SimulateLoadedResource(
-      {GURL(), -1 /* frame_tree_node_id */, false /* was_cached */,
-       1024 * 40 /* raw_body_bytes */, 0 /* original_network_content_length */,
-       nullptr /* data_reduction_proxy_data */,
-       content::ResourceType::RESOURCE_TYPE_MAIN_FRAME});
+  SimulateLoadedResource({false /* was_cached */,
+                          1024 * 40 /* raw_body_bytes */,
+                          0 /* original_network_content_length */,
+                          nullptr /* data_reduction_proxy_data */,
+                          content::ResourceType::RESOURCE_TYPE_MAIN_FRAME});
 
   page_load_metrics::PageLoadTiming timing;
   timing.navigation_start = base::Time::FromDoubleT(1);
   page_load_metrics::PageLoadMetadata metadata;
   metadata.behavior_flags |=
       blink::WebLoadingBehaviorFlag::kWebLoadingBehaviorSubresourceFilterMatch;
   SimulateTimingAndMetadataUpdate(timing, metadata);
 
-  SimulateLoadedResource(
-      {GURL(), -1 /* frame_tree_node_id */, false /* was_cached */,
-       1024 * 20 /* raw_body_bytes */, 0 /* original_network_content_length */,
-       nullptr /* data_reduction_proxy_data */,
-       content::ResourceType::RESOURCE_TYPE_MAIN_FRAME});
-
-  SimulateLoadedResource({GURL(), -1 /* frame_tree_node_id */,
-                          true /* was_cached */, 1024 * 10 /* raw_body_bytes */,
+  SimulateLoadedResource({false /* was_cached */,
+                          1024 * 20 /* raw_body_bytes */,
                           0 /* original_network_content_length */,
                           nullptr /* data_reduction_proxy_data */,
                           content::ResourceType::RESOURCE_TYPE_MAIN_FRAME});
+
+  SimulateLoadedResource({true /* was_cached */, 1024 * 10 /* raw_body_bytes */,
+                          0 /* original_network_content_length */,
+                          nullptr /* data_reduction_proxy_data */,
+                          content::ResourceType::RESOURCE_TYPE_MAIN_FRAME});
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramSubresourceFilterCount, 1);
 
   // Navigate away from the current page to force logging of request and byte
   // metrics.
   NavigateToUntrackedUrl();
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramSubresourceFilterTotalResources, 1);
@@ skipping 49 matching lines @@
   histogram_tester().ExpectTotalCount(
       internal::kHistogramSubresourceFilterMediaNetworkBytes, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterMediaNetworkBytes, 60, 1);
 
   histogram_tester().ExpectTotalCount(
       internal::kHistogramSubresourceFilterMediaCacheBytes, 1);
   histogram_tester().ExpectBucketCount(
       internal::kHistogramSubresourceFilterMediaCacheBytes, 10, 1);
 }