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());
+
+  bool inject_content_rules = !site_instance->GetProcess()->IsGuest() &&

[jochen (gone - plz use gerrit), 2013/11/28 22:23:30]

from the description, the bug happens in platform app processes, so this
shouldn't be needed

+      (!extension || !extension->is_platform_app());

[Charlie Reis, 2013/11/27 17:35:55]

This condition is really hard to read.  Please pull the ! out of the parentheses
to make it clearer that you mean "not a platform app".  Also worth adding a
comment saying "Don't inject content setting rules into guests and platform
apps."

I admit that I'm not very familiar with content settings.  Is it intentional to
never inject them into platform apps?  I think you mentioned that we used to
inject them but they were ignored on the renderer side?  Maybe it's worth
mentioning that in the comment.

[jochen (gone - plz use gerrit), 2013/11/28 22:23:30]

what happens for other processes that contain a browser plugin?

+  if (inject_content_rules) {
+    RendererContentSettingRules rules;
+    GetRendererContentSettingRules(
+        profile->GetHostContentSettingsMap(), &rules);
+    site_instance->GetProcess()->Send(
+        new ChromeViewMsg_SetContentSettingRules(rules));

[Charlie Reis, 2013/11/27 17:35:55]

SiteInstanceGotProcess can be called multiple times for the same
RenderProcessHost (e.g., if we're sharing a process), while RenderProcessCreated
is only called once per RenderProcessHost.  Is that ok for this message?

+  }
+
   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 1342 matching lines @@
   return IsExtensionOrSharedModuleWhitelisted(url, extension_set,
                                               allowed_file_handle_origins_) ||
          IsHostAllowedByCommandLine(url, extension_set,
                                     switches::kAllowNaClFileHandleAPI);
 #else
   return false;
 #endif
 }
 
 }  // namespace chrome