ContentSettingsObserver (+ related classes) cleanup.

chrome/browser/content_settings/host_content_settings_map.h

Index: chrome/browser/content_settings/host_content_settings_map.h
diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h
index 6945e6d3e803154d42e5f4ae390741eb0d02dd2f..163f89c203e1ef2041a235af3fe0efd5dd454484 100644
--- a/chrome/browser/content_settings/host_content_settings_map.h
+++ b/chrome/browser/content_settings/host_content_settings_map.h
@@ -60,11 +60,6 @@ class HostContentSettingsMap
   ContentSetting GetDefaultContentSetting(ContentSettingsType content_type,
                                           std::string* provider_id) const;
 
-  // Returns the default settings for all content types.
-  //
-  // This may be called on any thread.
-  ContentSettings GetDefaultContentSettings() const;
-
   // Returns a single |ContentSetting| which applies to the given URLs.  Note
   // that certain internal schemes are whitelisted. For |CONTENT_TYPE_COOKIES|,
   // |CookieSettings| should be used instead. For content types that can't be
@@ -94,14 +89,6 @@ class HostContentSettingsMap
       ContentSettingsPattern* primary_pattern,
       ContentSettingsPattern* secondary_pattern) const;
 
-  // Returns all ContentSettings which apply to the given |primary_url|. For
-  // content setting types that require an additional resource identifier, the
-  // default content setting is returned.
-  //
-  // This may be called on any thread.
-  ContentSettings GetContentSettings(
-      const GURL& primary_url) const;
-
   // For a given content type, returns all patterns with a non-default setting,
   // mapped to their actual settings, in the precedence order of the rules.
   // |settings| must be a non-NULL outparam.