Replace HostContentSettingsMap::AddExceptionForURL with SetNarrowestWebsiteSetting

components/content_settings/core/browser/host_content_settings_map.h

Index: components/content_settings/core/browser/host_content_settings_map.h
diff --git a/components/content_settings/core/browser/host_content_settings_map.h b/components/content_settings/core/browser/host_content_settings_map.h
index 79c22bc9b09c785630fd000c5cab7af773c95e8a..3eeafe48ca1024920d6b2f15445095e4192246bc 100644
--- a/components/content_settings/core/browser/host_content_settings_map.h
+++ b/components/content_settings/core/browser/host_content_settings_map.h
@@ -153,23 +153,14 @@ class HostContentSettingsMap : public content_settings::Observer,
                          base::Value* value);
 
   // Sets the most specific rule that currently defines the permission for the
-  // given permission type.
-  void SetNarrowestWebsiteSetting(
-      const ContentSettingsPattern& primary_pattern,
-      const ContentSettingsPattern& secondary_pattern,
-      ContentSettingsType content_type,
-      const std::string& resource_identifier,
-      ContentSetting setting,
-      content_settings::SettingInfo existing_info);
-
-  // Convenience method to add a content setting for the given URLs, making sure
-  // that there is no setting overriding it.
-  //
-  // This should only be called on the UI thread.
-  void AddExceptionForURL(const GURL& primary_url,
-                          const GURL& secondary_url,
-                          ContentSettingsType content_type,
-                          ContentSetting setting);
+  // given permission type. TODO(raymes): Remove this once all content settings

[msw, 2015/11/09 18:41:56]

nit: 'given content type'?

[raymes, 2015/11/09 23:29:02]

Done.

+  // are scoped to origin scope. There is no scope more narrow than origin

[Bernhard Bauer, 2015/11/05 11:28:10]

Just FTR: If that should happen in the future, I predict you will get complaints
because people will have to change settings for every. single. origin. one by
one instead of applying a subdomain wildcard or something. I'll shut up now
though ☺

[raymes, 2015/11/08 23:44:43]

Thanks Bernhard - this is a valid concern :) I wouldn't want to do something
that causes users pain. Let's experiment - if it turns out this is a problem we
can keep the current behavior or figure out something else :)

+  // scope, so we can just blindly set the value of the origin scope when that
+  // happens.
+  void SetNarrowestContentSetting(const GURL& primary_url,
+                                  const GURL& secondary_url,
+                                  ContentSettingsType type,
+                                  ContentSetting setting);
 
   // Clears all host-specific settings for one content type.
   //