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

chrome/browser/page_load_metrics/observers/data_reduction_proxy_metrics_observer_unittest.cc

 // Copyright 2016 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/data_reduction_proxy_metrics_observer.h"
 
 #include <stdint.h>
 
 #include <functional>
 #include <memory>
@@ skipping 400 matching lines @@
   ValidateLoFiInPingback(false);
 
   ResetTest();
 
   std::unique_ptr<DataReductionProxyData> data =
       base::MakeUnique<DataReductionProxyData>();
   data->set_used_data_reduction_proxy(true);
   data->set_lofi_received(true);
 
   // Verify LoFi is tracked when a LoFi response is received.
-
   page_load_metrics::ExtraRequestCompleteInfo resource = {
-      GURL(),
-      -1 /* frame_tree_node_id */,
-      true /*was_cached*/,
-      1024 * 40 /* raw_body_bytes */,
-      0 /* original_network_content_length */,
-      std::move(data),
+      true /*was_cached*/, 1024 * 40 /* raw_body_bytes */,
+      0 /* original_network_content_length */, std::move(data),
       content::ResourceType::RESOURCE_TYPE_MAIN_FRAME};
 
   RunTest(true, false);
   SimulateLoadedResource(resource);
   NavigateToUntrackedUrl();
   ValidateTimes();
   ValidateLoFiInPingback(true);
 
   ResetTest();
   // Verify that when data reduction proxy was not used, SendPingback is not
@@ skipping 15 matching lines @@
 
   RunTest(true, false);
 
   std::unique_ptr<DataReductionProxyData> data =
       base::MakeUnique<DataReductionProxyData>();
   data->set_used_data_reduction_proxy(true);
 
   // Prepare 4 resources of varying size and configurations.
   page_load_metrics::ExtraRequestCompleteInfo resources[] = {
       // Cached request.
-      {GURL(), -1 /* frame_tree_node_id */, true /*was_cached*/,
-       1024 * 40 /* raw_body_bytes */, 0 /* original_network_content_length */,
+      {true /*was_cached*/, 1024 * 40 /* raw_body_bytes */,
+       0 /* original_network_content_length */,
        nullptr /* data_reduction_proxy_data */,
        content::ResourceType::RESOURCE_TYPE_MAIN_FRAME},
       // Uncached non-proxied request.
-      {GURL(), -1 /* frame_tree_node_id */, false /*was_cached*/,
-       1024 * 40 /* raw_body_bytes */,
+      {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},
       // Uncached proxied request with .1 compression ratio.
-      {GURL(), -1 /* frame_tree_node_id */, false /*was_cached*/,
-       1024 * 40 /* raw_body_bytes */,
+      {false /*was_cached*/, 1024 * 40 /* raw_body_bytes */,
        1024 * 40 * 10 /* original_network_content_length */, data->DeepCopy(),
        content::ResourceType::RESOURCE_TYPE_MAIN_FRAME},
       // Uncached proxied request with .5 compression ratio.
-      {GURL(), -1 /* frame_tree_node_id */, false /*was_cached*/,
-       1024 * 40 /* raw_body_bytes */,
+      {false /*was_cached*/, 1024 * 40 /* raw_body_bytes */,
        1024 * 40 * 5 /* original_network_content_length */, std::move(data),
        content::ResourceType::RESOURCE_TYPE_MAIN_FRAME},
   };
 
   int network_resources = 0;
   int drp_resources = 0;
   int64_t network_bytes = 0;
   int64_t drp_bytes = 0;
   int64_t ocl_bytes = 0;
   for (const auto& request : resources) {
@@ skipping 21 matching lines @@
 
   RunTest(true, false);
 
   std::unique_ptr<DataReductionProxyData> data =
       base::MakeUnique<DataReductionProxyData>();
   data->set_used_data_reduction_proxy(true);
 
   // Prepare 4 resources of varying size and configurations.
   page_load_metrics::ExtraRequestCompleteInfo resources[] = {
       // Cached request.
-      {GURL(), -1 /* frame_tree_node_id */, true /*was_cached*/,
-       1024 * 40 /* raw_body_bytes */, 0 /* original_network_content_length */,
+      {true /*was_cached*/, 1024 * 40 /* raw_body_bytes */,
+       0 /* original_network_content_length */,
        nullptr /* data_reduction_proxy_data */,
        content::ResourceType::RESOURCE_TYPE_MAIN_FRAME},
       // Uncached non-proxied request.
-      {GURL(), -1 /* frame_tree_node_id */, false /*was_cached*/,
-       1024 * 40 /* raw_body_bytes */,
+      {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},
       // Uncached proxied request with .1 compression ratio.
-      {GURL(), -1 /* frame_tree_node_id */, false /*was_cached*/,
-       1024 * 40 * 10 /* raw_body_bytes */,
+      {false /*was_cached*/, 1024 * 40 * 10 /* raw_body_bytes */,
        1024 * 40 /* original_network_content_length */, data->DeepCopy(),
        content::ResourceType::RESOURCE_TYPE_MAIN_FRAME},
       // Uncached proxied request with .5 compression ratio.
-      {GURL(), -1 /* frame_tree_node_id */, false /*was_cached*/,
-       1024 * 40 * 5 /* raw_body_bytes */,
+      {false /*was_cached*/, 1024 * 40 * 5 /* raw_body_bytes */,
        1024 * 40 /* original_network_content_length */, std::move(data),
        content::ResourceType::RESOURCE_TYPE_MAIN_FRAME},
   };
 
   int network_resources = 0;
   int drp_resources = 0;
   int64_t network_bytes = 0;
   int64_t drp_bytes = 0;
   int64_t ocl_bytes = 0;
   for (const auto& request : resources) {
@@ skipping 10 matching lines @@
     }
   }
 
   NavigateToUntrackedUrl();
 
   ValidateDataHistograms(network_resources, drp_resources, network_bytes,
                          drp_bytes, ocl_bytes);
 }
 
 }  //  namespace data_reduction_proxy