ContentSettings API should not interact with <webview>

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 923 matching lines @@
       context));
 #endif
 #if defined(OS_ANDROID)
   host->AddFilter(new EncryptedMediaMessageFilterAndroid());
 #endif
 
   host->Send(new ChromeViewMsg_SetIsIncognitoProcess(
       profile->IsOffTheRecord()));
 
   SendExtensionWebRequestStatusToHost(host);
-
-  RendererContentSettingRules rules;
-  GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules);
-  host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
 }
 
 GURL ChromeContentBrowserClient::GetEffectiveURL(
     content::BrowserContext* browser_context, const GURL& url) {
   Profile* profile = Profile::FromBrowserContext(browser_context);
   if (!profile)
     return url;
 
   // If the input |url| should be assigned to the Instant renderer, make its
   // effective URL distinct from other URLs on the search provider's domain.
@@ skipping 311 matching lines @@
   }
 #endif
 
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   if (!service)
     return;
 
   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;
 
   service->process_map()->Insert(extension->id(),
                                  site_instance->GetProcess()->GetID(),
                                  site_instance->GetId());
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&InfoMap::RegisterExtensionProcess,
@@ skipping 1350 matching lines @@
   return IsExtensionOrSharedModuleWhitelisted(url, extension_set,
                                               allowed_file_handle_origins_) ||
          IsHostAllowedByCommandLine(url, extension_set,
                                     switches::kAllowNaClFileHandleAPI);
 #else
   return false;
 #endif
 }
 
 }  // namespace chrome