PlzNavigate: fix issue preventing navigations to WebUIs

content/browser/webui/url_data_manager_backend.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/webui/url_data_manager_backend.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 12 matching lines @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
 #include "content/browser/histogram_internals_request_job.h"
 #include "content/browser/net/view_blob_internals_job_factory.h"
 #include "content/browser/net/view_http_cache_job_factory.h"
 #include "content/browser/resource_context_impl.h"
 #include "content/browser/webui/shared_resources_data_source.h"
 #include "content/browser/webui/url_data_source_impl.h"
+#include "content/browser/webui/web_ui_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_request_info.h"
+#include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/log/net_log_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_error_job.h"
 #include "net/url_request/url_request_job.h"
@@ skipping 217 matching lines @@
 void URLRequestChromeJob::Start() {
   const GURL url = request_->url();
 
   TRACE_EVENT_ASYNC_BEGIN1("browser", "DataManager:Request", this, "URL",
       url.possibly_invalid_spec());
 
   int render_process_id, unused;
   bool is_renderer_request = ResourceRequestInfo::GetRenderFrameForRequest(
       request_, &render_process_id, &unused);
 
-  if (!is_renderer_request) {
+  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request_);

[Charlie Reis, 2016/05/25 21:38:02]

Wasn't this null in your previous patch set during the WebUIWebViewBrowserTest
tests?  I don't see any try jobs with this patch, so I've kicked one off.

+
+  if (!is_renderer_request || (IsBrowserSideNavigationEnabled() &&
+                               IsResourceTypeFrame(info->GetResourceType()))) {
+    // PlzNavigate: the check for navigations is performed by the
+    // NavigationRequest.
     StartAsync(true);
     return;
   }
 
   if (url.SchemeIs(kChromeUIScheme)) {
     // TODO(dbeam): it's not clear that partition checking is needed or used. It
     // was added for iframe-based signin (http://crbug.com/338127), which has
     // since changed. We should remove if no longer necessary.
     std::vector<std::string> hosts;
     hosts.push_back(content::kChromeUIResourcesHost);
@@ skipping 122 matching lines @@
 
 void URLRequestChromeJob::CheckStoragePartitionMatches(
     int render_process_id,
     const GURL& url,
     const base::WeakPtr<URLRequestChromeJob>& job) {
   // The embedder could put some webui pages in separate storage partition.
   // RenderProcessHostImpl::IsSuitableHost would guard against top level pages
   // being in the same process. We do an extra check to guard against an
   // exploited renderer pretending to add them as a subframe. We skip this check
   // for resources.
-  bool allowed = false;
-  RenderProcessHost* process = RenderProcessHost::FromID(render_process_id);
-  if (process) {
-    StoragePartition* partition = BrowserContext::GetStoragePartitionForSite(
-        process->GetBrowserContext(), url);
-    allowed = partition == process->GetStoragePartition();
-  }
+  bool allowed = WebUIImpl::RenderProcessAllowedForURL(
+      RenderProcessHost::FromID(render_process_id), url);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&URLRequestChromeJob::StartAsync, job, allowed));
 }
 
 void URLRequestChromeJob::StartAsync(bool allowed) {
   if (!request_)
     return;
 
@@ skipping 368 matching lines @@
 
 }  // namespace
 
 net::URLRequestJobFactory::ProtocolHandler*
 CreateDevToolsProtocolHandler(content::ResourceContext* resource_context,
                               bool is_incognito) {
   return new DevToolsJobFactory(resource_context, is_incognito);
 }
 
 }  // namespace content