[PageLoadMetrics] Keep track of Ad Sizes on Pages

chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc

Index: chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc
diff --git a/chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc b/chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc
index f1d2e06040666f605629e84e607bf5dee0ccd1f4..0b8ead55d6547fcaa201b325ea02edad2b372c45 100644
--- a/chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc
+++ b/chrome/browser/page_load_metrics/observers/subresource_filter_metrics_observer_unittest.cc
@@ -153,11 +153,11 @@ TEST_F(SubresourceFilterMetricsObserverTest, Basic) {
 TEST_F(SubresourceFilterMetricsObserverTest, Subresources) {
   NavigateAndCommit(GURL(kDefaultTestUrl));
 
-  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});
+  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});
 
   page_load_metrics::PageLoadTiming timing;
   timing.navigation_start = base::Time::FromDoubleT(1);
@@ -166,13 +166,14 @@ TEST_F(SubresourceFilterMetricsObserverTest, Subresources) {
       blink::WebLoadingBehaviorFlag::kWebLoadingBehaviorSubresourceFilterMatch;
   SimulateTimingAndMetadataUpdate(timing, metadata);
 
-  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(
+      {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({true /* was_cached */, 1024 * 10 /* raw_body_bytes */,
+  SimulateLoadedResource({GURL(), -1 /* frame_tree_node_id */,
+                          true /* was_cached */, 1024 * 10 /* raw_body_bytes */,
                           0 /* original_network_content_length */,
                           nullptr /* data_reduction_proxy_data */,
                           content::ResourceType::RESOURCE_TYPE_MAIN_FRAME});
@@ -251,11 +252,11 @@ TEST_F(SubresourceFilterMetricsObserverTest, SubresourcesWithMedia) {
 
   SimulateMediaPlayed();
 
-  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});
+  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});
 
   page_load_metrics::PageLoadTiming timing;
   timing.navigation_start = base::Time::FromDoubleT(1);
@@ -264,13 +265,14 @@ TEST_F(SubresourceFilterMetricsObserverTest, SubresourcesWithMedia) {
       blink::WebLoadingBehaviorFlag::kWebLoadingBehaviorSubresourceFilterMatch;
   SimulateTimingAndMetadataUpdate(timing, metadata);
 
-  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(
+      {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({true /* was_cached */, 1024 * 10 /* raw_body_bytes */,
+  SimulateLoadedResource({GURL(), -1 /* frame_tree_node_id */,
+                          true /* was_cached */, 1024 * 10 /* raw_body_bytes */,
                           0 /* original_network_content_length */,
                           nullptr /* data_reduction_proxy_data */,
                           content::ResourceType::RESOURCE_TYPE_MAIN_FRAME});