clean up partition check in url_data_manager_backend.cc

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/basictypes.h"
 #include "base/bind.h"
@@ skipping 338 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.
-  // TODO(guohui): move URL constants for extension-icon, favicon, theme, thumb,
-  // thumb and thumbnails from chrome/common/url_constants.h to
-  // content/public/common/url_constants.h, so that they could be reused here.
   bool allowed = false;
+  std::vector<std::string> hosts;
+  GetContentClient()->
+      browser()->GetAdditionalWebUIHostsToIgnoreParititionCheck(&hosts);
   if (url.SchemeIs(kChromeUIScheme) &&
-      (url.host() == kChromeUIResourcesHost ||

[Dan Beam, 2016/05/17 03:43:48]

it seems as if this host got dropped during this refactor as well :(

-       url.host() == "extension-icon" ||
-       url.host() == "favicon" ||
-       url.host() == "theme" ||
-       url.host() == "thumb" ||
-       url.host() == "thumb2" ||
-       url.host() == "thumbnails")) {
+      (url.SchemeIs(kChromeUIScheme) ||
+       std::find(hosts.begin(), hosts.end(), url.host()) != hosts.end())) {

[Dan Beam, 2016/05/17 02:28:55]

did this code ever work?  it seems like any chrome:// scheme URL would be
allowed and |hosts| was effectively never used.

[Charlie Reis, 2016/05/17 21:08:24]

Yeah, this doesn't match the change that jam@ requested (i.e., putting
kChromeUIResourcesHost into hosts), and it broke the outcome.  Apparently there
weren't any tests to catch it either.

     allowed = true;
   } else {
     RenderProcessHost* process = RenderProcessHost::FromID(render_process_id);
     if (process) {
       StoragePartition* partition = BrowserContext::GetStoragePartitionForSite(
           process->GetBrowserContext(), url);
       allowed = partition == process->GetStoragePartition();
     }
   }
 
@@ skipping 343 matching lines @@
 
 }  // namespace
 
 net::URLRequestJobFactory::ProtocolHandler*
 CreateDevToolsProtocolHandler(content::ResourceContext* resource_context,
                               bool is_incognito) {
   return new DevToolsJobFactory(resource_context, is_incognito);
 }
 
 }  // namespace content