Fixing guest processes to use the proper storage partition.

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 <set>
 #include <utility>
 #include <vector>
 
@@ skipping 473 matching lines @@
       // we can pick any of them to retrieve the storage partition id.
       extension =
           extension_service->extensions()->GetByID(*(extension_ids.begin()));
   }
   return GetStoragePartitionIdForExtension(browser_context, extension);
 }
 
 std::string ChromeContentBrowserClient::GetStoragePartitionIdForSite(
     content::BrowserContext* browser_context,
     const GURL& site) {
+  if (site.SchemeIs(chrome::kGuestScheme))

[Nico, 2012/10/31 01:26:05]

"guest" means "a process embedded in another process" or some such in this
context and is unrelated to cros guest accounts, right? Can this be renamed so
that that's more explicit?

+    return "guest-" + site.host();
+
   const Extension* extension = NULL;
   Profile* profile = Profile::FromBrowserContext(browser_context);
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   if (extension_service) {
     extension = extension_service->extensions()->
         GetExtensionOrAppByURL(ExtensionURLInfo(site));
   }
 
   return GetStoragePartitionIdForExtension(browser_context, extension);
@@ skipping 1093 matching lines @@
   if (web_prefs->default_encoding.empty()) {
     prefs->ClearPref(prefs::kDefaultCharset);
     web_prefs->default_encoding = prefs->GetString(prefs::kDefaultCharset);
   }
   DCHECK(!web_prefs->default_encoding.empty());
 
   WebContents* web_contents = WebContents::FromRenderViewHost(rvh);
   chrome::ViewType view_type = chrome::GetViewType(web_contents);
   ExtensionService* service = profile->GetExtensionService();
   if (service) {
-    const Extension* extension = service->extensions()->GetByID(
-        rvh->GetSiteInstance()->GetSiteURL().host());
-    extension_webkit_preferences::SetPreferences(
-        extension, view_type, web_prefs);
+    const GURL& url = rvh->GetSiteInstance()->GetSiteURL();
+    // Ensure that we are only granting extension preferences to URLs with the
+    // correct scheme. Without this check, guest:// schemes used by webview
+    // tags as well as hosts that happen to match the id of an install extension
+    // would get the wrong preferences.
+    if (url.SchemeIs(chrome::kExtensionScheme)) {
+      const Extension* extension = service->extensions()->GetByID(url.host());
+      extension_webkit_preferences::SetPreferences(
+          extension, view_type, web_prefs);
+    }
   }
 
   if (content::IsForceCompositingModeEnabled())
     web_prefs->force_compositing_mode = true;
 
   if (view_type == chrome::VIEW_TYPE_NOTIFICATION) {
     web_prefs->allow_scripts_to_close_windows = true;
   } else if (view_type == chrome::VIEW_TYPE_BACKGROUND_CONTENTS) {
     // Disable all kinds of acceleration for background pages.
     // See http://crbug.com/96005 and http://crbug.com/96006
@@ skipping 256 matching lines @@
     partition_id = extension->id();
   }
 
   // Enforce that IsValidStoragePartitionId() implementation stays in sync.
   DCHECK(IsValidStoragePartitionId(browser_context, partition_id));
   return partition_id;
 }
 
 
 }  // namespace chrome