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

chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc

 // Copyright (c) 2012 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/loader/chrome_resource_dispatcher_host_delegate.h"
 
 #include <stdint.h>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 349 matching lines @@
           web_contents);
 
   if (metrics_observer) {
     metrics_observer->OnRequestStarted(request_id, resource_type,
                                        request_creation_time);
   }
 }
 
 void NotifyUIThreadOfRequestComplete(
     const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
-    const content::ResourceRequestInfo::FrameTreeNodeIdGetter&
-        frame_tree_node_id_getter,
     const GURL& url,
     const content::GlobalRequestID& request_id,
     ResourceType resource_type,
     bool was_cached,
     std::unique_ptr<data_reduction_proxy::DataReductionProxyData>
         data_reduction_proxy_data,
     int net_error,
     int64_t total_received_bytes,
     int64_t raw_body_bytes,
     int64_t original_content_length,
@@ skipping 14 matching lines @@
         offline_pages::BackgroundLoaderOffliner::FromWebContents(web_contents);
 
     if (background_loader)
       background_loader->OnNetworkBytesChanged(total_received_bytes);
 #endif  // OS_ANDROID
   }
   page_load_metrics::MetricsWebContentsObserver* metrics_observer =
       page_load_metrics::MetricsWebContentsObserver::FromWebContents(
           web_contents);
   if (metrics_observer) {
-    metrics_observer->OnRequestComplete(
-        url, frame_tree_node_id_getter.Run(), request_id, resource_type,
-        was_cached, std::move(data_reduction_proxy_data), raw_body_bytes,
-        original_content_length, request_creation_time);
+    metrics_observer->OnRequestComplete(request_id, resource_type, was_cached,
+                                        std::move(data_reduction_proxy_data),
+                                        raw_body_bytes, original_content_length,
+                                        request_creation_time);
   }
 }
 
 }  // namespace
 
 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate()
     : download_request_limiter_(g_browser_process->download_request_limiter()),
       safe_browsing_(g_browser_process->safe_browsing_service())
 #if BUILDFLAG(ENABLE_EXTENSIONS)
       , user_script_listener_(new extensions::UserScriptListener())
@@ skipping 443 matching lines @@
   if (data)
     data_reduction_proxy_data = data->DeepCopy();
   int64_t original_content_length =
       data && data->used_data_reduction_proxy()
           ? data_reduction_proxy::util::CalculateEffectiveOCL(*url_request)
           : url_request->GetRawBodyBytes();
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::BindOnce(&NotifyUIThreadOfRequestComplete,
-                     info->GetWebContentsGetterForRequest(),
-                     info->GetFrameTreeNodeIdGetterForRequest(),
-                     url_request->url(), info->GetGlobalRequestID(),
-                     info->GetResourceType(), url_request->was_cached(),
+                     info->GetWebContentsGetterForRequest(), url_request->url(),
+                     info->GetGlobalRequestID(), info->GetResourceType(),
+                     url_request->was_cached(),
                      base::Passed(&data_reduction_proxy_data), net_error,
                      url_request->GetTotalReceivedBytes(),
                      url_request->GetRawBodyBytes(), original_content_length,
                      url_request->creation_time(),
                      base::TimeTicks::Now() - url_request->creation_time()));
 }
 
 content::PreviewsState ChromeResourceDispatcherHostDelegate::GetPreviewsState(
     const net::URLRequest& url_request,
     content::ResourceContext* resource_context) {
@@ skipping 67 matching lines @@
             &ChromeResourceDispatcherHostDelegate::OnAbortedFrameLoad,
             base::Unretained(this), url, request_loading_time));
     return;
   }
 
   std::string metric_name = (request_loading_time.InMilliseconds() < 100 ?
       "Net.ErrAborted.Fast" : "Net.ErrAborted.Slow");
   rappor::SampleDomainAndRegistryFromGURL(
       g_browser_process->rappor_service(), metric_name, url);
 }