ContentSettings API should not interact with <webview>

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 37faaf8c449c745fe866c41bd4991e55fdbe38cf..32b7d4f4530b37b1b1730c717e22a8386594a106 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -943,7 +943,12 @@ void ChromeContentBrowserClient::RenderProcessHostCreated(
   SendExtensionWebRequestStatusToHost(host);
 
   RendererContentSettingRules rules;
-  GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules);
+  if (host->IsGuest()) {
+    GuestView::GetDefaultContentSettingRules(&rules, profile->IsOffTheRecord());
+  } else {
+    GetRendererContentSettingRules(
+        profile->GetHostContentSettingsMap(), &rules);
+  }
   host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
 }
 
@@ -1276,6 +1281,7 @@ void ChromeContentBrowserClient::SiteInstanceGotProcess(
 
   const Extension* extension = service->extensions()->GetExtensionOrAppByURL(
       site_instance->GetSiteURL());
+

[Charlie Reis, 2013/12/03 18:36:04]

nit: No need for churn here.

[Fady Samuel, 2013/12/03 18:50:56]

Done.

   if (!extension)
     return;