Create the correct SiteInstance when restoring tabs that belong to apps.

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 65 matching lines @@
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
 #endif
 
 namespace {
 
 void InitRenderViewHostForExtensions(RenderViewHost* render_view_host) {
   // Note that due to GetEffectiveURL(), even hosted apps will have a
   // chrome-extension:// URL for their site, so we can ignore that wrinkle here.
   SiteInstance* site_instance = render_view_host->site_instance();
   const GURL& site = site_instance->site();
-  RenderProcessHost* process = render_view_host->process();
 
   if (!site.SchemeIs(chrome::kExtensionScheme))
     return;
 
   Profile* profile = site_instance->browsing_instance()->profile();
   ExtensionService* service = profile->GetExtensionService();
   if (!service)
     return;
 
   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();
 
   // Register the association between extension and SiteInstance with
   // ExtensionProcessManager.
   // TODO(creis): Use this to replace SetInstalledAppForRenderer below.
   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.
@@ skipping 634 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome