Avoid using ContentBrowserClient::IsIllegalOrigin in ResourceDispatcherHost.

chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

 // Copyright 2014 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/extensions/chrome_content_browser_client_extensions_part.h"
 
 #include <stddef.h>
 
 #include <set>
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/extensions/extension_webkit_preferences.h"
 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/chrome_extension_message_filter.h"
 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_process_policy.h"
 #include "components/guest_view/browser/guest_view_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/browser_url_handler.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/vpn_service_proxy.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/browser/api/web_request/web_request_api.h"
 #include "extensions/browser/api/web_request/web_request_api_helpers.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_message_filter.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_service_worker_message_filter.h"
@@ skipping 471 matching lines @@
   chromeos::VpnService* vpn_service =
       chromeos::VpnServiceFactory::GetForBrowserContext(browser_context);
   if (!vpn_service)
     return nullptr;
   return vpn_service->GetVpnServiceProxy();
 #else
   return nullptr;
 #endif
 }
 
+// static
+void ChromeContentBrowserClientExtensionsPart::AddExtension(

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

these two methods are only called by extension_system_impl.cc, so they could
just be moved to it. the reason is that this class is the extension related
callbacks from content->extensions. for extension->content code, you can just
have that at the originating extensions code.

also, the extension code can just do a PostTask directly on the RDH instead of
posting a task to another method which does this

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

Done. I did not want another PostTask to the RDH on the IO thread because we
already do one post task to add the extension information to the InfoMap on the
IO thread.

+    const content::ResourceContext* context,
+    const Extension* extension) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  // Check for platform app origins.  These can only be committed by the app
+  // itself, or by one if its guests if there are accessible_resources.
+  if (extension->is_platform_app() &&
+      extension->GetManifestData(manifest_keys::kWebviewAccessibleResources)) {
+    DCHECK(content::ResourceDispatcherHost::Get());
+    content::ResourceDispatcherHost::Get()->AddOriginAccessInformation(
+        context, Extension::GetBaseURLFromExtensionId(extension->id()).spec());
+  }
+}
+
+void ChromeContentBrowserClientExtensionsPart::RemoveExtension(
+    const content::ResourceContext* context,
+    const std::string& extension_id) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  DCHECK(content::ResourceDispatcherHost::Get());
+  content::ResourceDispatcherHost::Get()->RemoveOriginAccessInformation(
+      context, Extension::GetBaseURLFromExtensionId(extension_id).spec());
+}
+
 void ChromeContentBrowserClientExtensionsPart::RenderProcessWillLaunch(
     content::RenderProcessHost* host) {
   int id = host->GetID();
   Profile* profile = Profile::FromBrowserContext(host->GetBrowserContext());
 
   host->AddFilter(new ChromeExtensionMessageFilter(id, profile));
   host->AddFilter(new ExtensionMessageFilter(id, profile));
   host->AddFilter(new IOThreadExtensionMessageFilter(id, profile));
   host->AddFilter(new ExtensionsGuestViewMessageFilter(id, profile));
   if (extensions::ExtensionsClient::Get()
@@ skipping 15 matching lines @@
           site_instance->GetSiteURL());
   if (!extension)
     return;
 
   ProcessMap::Get(context)->Insert(extension->id(),
                                    site_instance->GetProcess()->GetID(),
                                    site_instance->GetId());
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      base::Bind(&InfoMap::RegisterExtensionProcess,
-                 ExtensionSystem::Get(context)->info_map(), extension->id(),
-                 site_instance->GetProcess()->GetID(), site_instance->GetId()));
+      base::Bind(&ChromeContentBrowserClientExtensionsPart::
+                     RegisterExtensionProcessHelper,
+                 base::RetainedRef(ExtensionSystem::Get(context)->info_map()),
+                 base::RetainedRef(extension),
+                 site_instance->GetProcess()->GetID(), site_instance->GetId(),
+                 context->GetResourceContext()));
 }
 
 void ChromeContentBrowserClientExtensionsPart::SiteInstanceDeleting(
     SiteInstance* site_instance) {
   BrowserContext* context = site_instance->GetBrowserContext();
   ExtensionRegistry* registry = ExtensionRegistry::Get(context);
   if (!registry)
     return;
 
   const Extension* extension =
       registry->enabled_extensions().GetExtensionOrAppByURL(
           site_instance->GetSiteURL());
   if (!extension)
     return;
 
   ProcessMap::Get(context)->Remove(extension->id(),
                                    site_instance->GetProcess()->GetID(),
                                    site_instance->GetId());
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
-      base::Bind(&InfoMap::UnregisterExtensionProcess,
-                 ExtensionSystem::Get(context)->info_map(), extension->id(),
-                 site_instance->GetProcess()->GetID(), site_instance->GetId()));
+      base::Bind(&ChromeContentBrowserClientExtensionsPart::
+                     UnregisterExtensionProcessHelper,
+                 base::RetainedRef(ExtensionSystem::Get(context)->info_map()),
+                 base::RetainedRef(extension),
+                 site_instance->GetProcess()->GetID(), site_instance->GetId(),
+                 context->GetResourceContext()));
 }
 
 void ChromeContentBrowserClientExtensionsPart::OverrideWebkitPrefs(
     RenderViewHost* rvh,
     WebPreferences* web_prefs) {
   const ExtensionRegistry* registry =
       ExtensionRegistry::Get(rvh->GetProcess()->GetBrowserContext());
   if (!registry)
     return;
 
@@ skipping 62 matching lines @@
 #if defined(ENABLE_WEBRTC)
     command_line->AppendSwitch(::switches::kEnableWebRtcHWH264Encoding);
 #endif
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableMojoSerialService)) {
       command_line->AppendSwitch(switches::kEnableMojoSerialService);
     }
   }
 }
 
+// static
+void ChromeContentBrowserClientExtensionsPart::RegisterExtensionProcessHelper(
+    InfoMap* info_map,
+    const Extension* extension,
+    int process_id,
+    int site_instance_id,
+    const content::ResourceContext* context) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  info_map->RegisterExtensionProcess(extension->id(), process_id,
+                                     site_instance_id);
+
+  if (extension->is_platform_app()) {
+    DCHECK(content::ResourceDispatcherHost::Get());
+    content::ResourceDispatcherHost::Get()->AddOwnerForOrigin(
+        context, extension->id(), process_id);
+  }
+}
+
+// static
+void ChromeContentBrowserClientExtensionsPart::UnregisterExtensionProcessHelper(
+    InfoMap* info_map,
+    const Extension* extension,
+    int process_id,
+    int site_instance_id,
+    const content::ResourceContext* context) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  info_map->UnregisterExtensionProcess(extension->id(), process_id,
+                                       site_instance_id);
+
+  if (extension->is_platform_app()) {
+    DCHECK(content::ResourceDispatcherHost::Get());
+    content::ResourceDispatcherHost::Get()->RemoveOwnerForOrigin(
+        context, extension->id(), process_id);
+  }
+}
+
 }  // namespace extensions