Handle webuis when using the network service.

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"
 #include "content/common/net/url_request_service_worker_data.h"
 #include "content/common/net/url_request_user_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/process_type.h"
 #include "net/url_request/url_request.h"
 
 namespace content {
 
 namespace {
 
-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
 
 // ----------------------------------------------------------------------------
@@ skipping 153 matching lines @@
 ResourceRequestInfoImpl::~ResourceRequestInfoImpl() {
 }
 
 ResourceRequestInfo::WebContentsGetter
 ResourceRequestInfoImpl::GetWebContentsGetterForRequest() const {
   // PlzNavigate: navigation requests are created with a valid FrameTreeNode ID
   // and invalid RenderProcessHost and RenderFrameHost IDs. The FrameTreeNode
   // ID should be used to access the WebContents.
   if (frame_tree_node_id_ != -1) {
     DCHECK(IsBrowserSideNavigationEnabled());
-    return base::Bind(&GetWebContentsFromFTNID, frame_tree_node_id_);
+    return base::Bind(WebContents::FromFrameTreeNodeId, frame_tree_node_id_);
   }
 
   // In other cases, use the RenderProcessHost ID + RenderFrameHost ID to get
   // the WebContents.
   int render_process_host_id = -1;
   int render_frame_host_id = -1;
   if (!GetAssociatedRenderFrame(&render_process_host_id,
                                 &render_frame_host_id)) {
     NOTREACHED();
   }
@@ skipping 152 matching lines @@
     on_transfer_.Run(std::move(url_loader_request),
                      std::move(url_loader_client));
   }
 }
 
 void ResourceRequestInfoImpl::ResetBody() {
   body_ = nullptr;
 }
 
 }  // namespace content