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..9345bbcda73d0a030e33b3cb61f0f541d2b8715e 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -941,10 +941,6 @@ void ChromeContentBrowserClient::RenderProcessHostCreated(
       profile->IsOffTheRecord()));
 
   SendExtensionWebRequestStatusToHost(host);
-
-  RendererContentSettingRules rules;
-  GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules);
-  host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
 }
 
 GURL ChromeContentBrowserClient::GetEffectiveURL(
@@ -1276,6 +1272,17 @@ void ChromeContentBrowserClient::SiteInstanceGotProcess(
 
   const Extension* extension = service->extensions()->GetExtensionOrAppByURL(
       site_instance->GetSiteURL());
+
+  RendererContentSettingRules rules;

[jochen (gone - plz use gerrit), 2013/12/03 08:55:21]

can we keep this block in RenderProcessHostCreated?

[Fady Samuel, 2013/12/03 15:31:27]

Done.

+  if (site_instance->GetProcess()->IsGuest()) {
+    GuestView::GetDefaultContentSettingRules(&rules);
+  } else {
+    GetRendererContentSettingRules(
+        profile->GetHostContentSettingsMap(), &rules);
+  }
+  site_instance->GetProcess()->Send(
+      new ChromeViewMsg_SetContentSettingRules(rules));
+
   if (!extension)
     return;