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);
+}
+
+// static
+void ChromeContentBrowserClient::SetContentSettingRules(
+    content::RenderViewHost* host) {
+  // <*view> guests should not be affected by ContentSettingRules.
+  if (host->GetProcess()->IsGuest())
+    return;
+
+  SiteInstance* site_instance = host->GetSiteInstance();
+  if (!site_instance)
+    return;
+
+  Profile* profile = Profile::FromBrowserContext(
+      host->GetProcess()->GetBrowserContext());
+  if (!profile)
+    return;
+
+  ExtensionService* extension_service =
+      extensions::ExtensionSystem::Get(profile)->extension_service();
+  if (!extension_service)
+    return;
+
+  // Extensions should not be affected by ContentSettingRules.
+  const Extension* extension = extension_service->extensions()->
+      GetHostedAppByURL(site_instance->GetSiteURL());
+  if (extension)
+    return;
 
   RendererContentSettingRules rules;
-  GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules);
-  host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
+  GetRendererContentSettingRules(profile->GetHostContentSettingsMap(),
+                                 &rules);

[markusheintz_, 2013/11/25 18:04:41]

nit: I guess this fits into the line above.

[Fady Samuel, 2013/11/25 21:54:02]

Done.

+  host->Send(new ChromeViewMsg_SetContentSettingRules(
+      host->GetRoutingID(), rules));
+}
+
+void ChromeContentBrowserClient::RenderViewReady(
+    content::RenderViewHost* host) {
+  SetContentSettingRules(host);
 }
 
 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 1671 matching lines @@
   return IsExtensionOrSharedModuleWhitelisted(url, extension_set,
                                               allowed_file_handle_origins_) ||
          IsHostAllowedByCommandLine(url, extension_set,
                                     switches::kAllowNaClFileHandleAPI);
 #else
   return false;
 #endif
 }
 
 }  // namespace chrome