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

content/browser/loader/resource_request_info_impl.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 "content/browser/loader/resource_request_info_impl.h"
 
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/loader/global_routing_id.h"
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 12 matching lines @@
 WebContents* GetWebContentsFromFTNID(int frame_tree_node_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   FrameTreeNode* frame_tree_node =
       FrameTreeNode::GloballyFindByID(frame_tree_node_id);
   if (!frame_tree_node)
     return nullptr;
 
   return WebContentsImpl::FromFrameTreeNode(frame_tree_node);
 }
 
-int FrameTreeNodeIdFromHostIds(int render_process_host_id,
-                               int render_frame_host_id) {
-  RenderFrameHost* render_frame_host =
-      RenderFrameHost::FromID(render_process_host_id, render_frame_host_id);
-  return render_frame_host ? render_frame_host->GetFrameTreeNodeId() : -1;
-}
-
 }  // namespace
 
 // ----------------------------------------------------------------------------
 // ResourceRequestInfo
 
 // static
 const ResourceRequestInfo* ResourceRequestInfo::ForRequest(
     const net::URLRequest* request) {
   return ResourceRequestInfoImpl::ForRequest(request);
 }
@@ skipping 162 matching lines @@
   int render_frame_host_id = -1;
   if (!GetAssociatedRenderFrame(&render_process_host_id,
                                 &render_frame_host_id)) {
     NOTREACHED();
   }
 
   return base::Bind(&WebContentsImpl::FromRenderFrameHostID,
                     render_process_host_id, render_frame_host_id);
 }
 
-ResourceRequestInfo::FrameTreeNodeIdGetter
-ResourceRequestInfoImpl::GetFrameTreeNodeIdGetterForRequest() const {
-  if (frame_tree_node_id_ != -1) {
-    DCHECK(IsBrowserSideNavigationEnabled());
-    return base::Bind([](int id) { return id; }, frame_tree_node_id_);
-  }
-
-  int render_process_host_id = -1;
-  int render_frame_host_id = -1;
-  if (!GetAssociatedRenderFrame(&render_process_host_id,
-                                &render_frame_host_id)) {
-    NOTREACHED();
-  }
-
-  return base::Bind(&FrameTreeNodeIdFromHostIds, render_process_host_id,
-                    render_frame_host_id);
-}
-
 ResourceContext* ResourceRequestInfoImpl::GetContext() const {
   return context_;
 }
 
 int ResourceRequestInfoImpl::GetChildID() const {
   return requester_info_->child_id();
 }
 
 int ResourceRequestInfoImpl::GetRouteID() const {
   return route_id_;
@@ skipping 119 matching lines @@
     on_transfer_.Run(std::move(url_loader_request),
                      std::move(url_loader_client));
   }
 }
 
 void ResourceRequestInfoImpl::ResetBody() {
   body_ = nullptr;
 }
 
 }  // namespace content