Tie extension/app initialization to RenderView creation, not RenderViewHost creation

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2011 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 "base/command_line.h"
 #include "chrome/app/breakpad_mac.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 27 matching lines @@
 #include "chrome/browser/ssl/ssl_add_cert_handler.h"
 #include "chrome/browser/ssl/ssl_blocking_page.h"
 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
 #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_url_handler.h"
 #include "content/browser/browsing_instance.h"
-#include "content/browser/child_process_security_policy.h"
 #include "content/browser/debugger/devtools_handler.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/resource_context.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/ssl/ssl_cert_error_handler.h"
 #include "content/browser/ssl/ssl_client_auth_handler.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/worker_host/worker_process_host.h"
@@ skipping 32 matching lines @@
 
   ExtensionProcessManager* process_manager =
       profile->GetExtensionProcessManager();
   CHECK(process_manager);
 
   // This can happen if somebody typos a chrome-extension:// URL.
   const Extension* extension = service->GetExtensionByURL(site);
   if (!extension)
     return;
 
   site_instance->GetProcess()->mark_is_extension_process();

[Charlie Reis, 2011/08/11 19:10:55]

Ah yes, this only needs to be done once, because the RPH stays constant even
when the process dies and is recreated.

 
   // Register the association between extension and SiteInstance with
   // ExtensionProcessManager.
-  // TODO(creis): Use this to replace SetInstalledAppForRenderer below.
+  // TODO(creis): Use this to replace SetInstalledAppForRenderer in
+  // ChromeRenderViewHostObserver::InitRenderViewHostForExtensions.
   process_manager->RegisterExtensionSiteInstance(site_instance->id(),
                                                  extension->id());
 
-  RenderProcessHost* process = render_view_host->process();
-
-  if (extension->is_app()) {
-    render_view_host->Send(
-        new ExtensionMsg_ActivateApplication(extension->id()));
-    // Record which, if any, installed app is associated with this process.
-    // TODO(aa): Totally lame to store this state in a global map in extension
-    // service. Can we get it from EPM instead?
-    service->SetInstalledAppForRenderer(process->id(), extension);
-  }
-
-  // Some extensions use chrome:// URLs.
-  Extension::Type type = extension->GetType();
-  if (type == Extension::TYPE_EXTENSION ||
-      type == Extension::TYPE_PACKAGED_APP) {
-    ChildProcessSecurityPolicy::GetInstance()->GrantScheme(
-        process->id(), chrome::kChromeUIScheme);
-  }
-
   // Enable extension bindings for the renderer. Currently only extensions,
   // packaged apps, and hosted component apps use extension bindings.
+  Extension::Type type = extension->GetType();
   if (type == Extension::TYPE_EXTENSION ||
       type == Extension::TYPE_USER_SCRIPT ||
       type == Extension::TYPE_PACKAGED_APP ||
       (type == Extension::TYPE_HOSTED_APP &&
        extension->location() == Extension::COMPONENT)) {
-    render_view_host->Send(new ExtensionMsg_ActivateExtension(extension->id()));
     render_view_host->AllowBindings(BindingsPolicy::EXTENSION);
   }
 }
 
 // Handles rewriting Web UI URLs.
 static bool HandleWebUI(GURL* url, content::BrowserContext* browser_context) {
   if (!ChromeWebUIFactory::GetInstance()->UseWebUIForURL(browser_context, *url))
     return false;
 
   // Special case the new tab page. In older versions of Chrome, the new tab
@@ skipping 632 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome