Avoid using ContentBrowserClient::IsIllegalOrigin in ResourceDispatcherHost.

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 135 matching lines @@
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/geolocation_delegate.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/navigation_throttle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_context.h"
+#include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/vpn_service_proxy.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "content/public/common/sandbox_type.h"
@@ skipping 981 matching lines @@
     content::RenderProcessHost* process_host,
     const GURL& url) {
 #if defined(ENABLE_EXTENSIONS)
   return ChromeContentBrowserClientExtensionsPart::CanCommitURL(
       process_host, url);
 #else
   return true;
 #endif
 }
 
 bool ChromeContentBrowserClient::IsIllegalOrigin(

[jam, 2016/08/01 20:06:01]

remove this method here and in the public interface and in
ChromeContentBrowserClientExtensionsPart

[ananta, 2016/08/02 00:40:49]

Done.

[jam, 2016/08/02 17:01:46]

please also remove from ContentBrowserClient

     content::ResourceContext* resource_context,
     int child_process_id,
     const GURL& origin) {
 #if defined(ENABLE_EXTENSIONS)
   return ChromeContentBrowserClientExtensionsPart::IsIllegalOrigin(
       resource_context, child_process_id, origin);
 #else
   return false;
 #endif
 }
@@ skipping 1119 matching lines @@
                                        blocked_params));
     return false;
   }
 #endif
 
   return true;
 }
 
 void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+#if defined(ENABLE_EXTENSIONS)
+  DCHECK(content::ResourceDispatcherHost::Get());

[jam, 2016/08/01 20:06:01]

nit: not needed by definition. if somehow someone tried to change this to call
this method before RDH was created, there would be a crash which is just as
useful of a signal

[ananta, 2016/08/02 00:40:49]

Done.

+  content::ResourceDispatcherHost::Get()->AddSchemeForAccessCheck(
+      extensions::kExtensionScheme);

[jam, 2016/08/01 20:06:01]

The rest of the RDH initialization on the chrome side is in
BrowserProcessImpl::ResourceDispatcherHostCreated, so probably best to keep this
there with them

[ananta, 2016/08/02 00:40:49]

Done.

+#endif
   return g_browser_process->ResourceDispatcherHostCreated();
 }
 
 content::SpeechRecognitionManagerDelegate*
     ChromeContentBrowserClient::CreateSpeechRecognitionManagerDelegate() {
   return new speech::ChromeSpeechRecognitionManagerDelegate();
 }
 
 net::NetLog* ChromeContentBrowserClient::GetNetLog() {
   return g_browser_process->net_log();
@@ skipping 769 matching lines @@
   if (channel <= kMaxDisableEncryptionChannel) {
     static const char* const kWebRtcDevSwitchNames[] = {
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)