ContentSettingsObserver (+ related classes) cleanup.

chrome/browser/content_settings/host_content_settings_map.h

 // Copyright (c) 2011 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.
 
 // Maps hostnames to custom content settings.  Written on the UI thread and read
 // on any thread.  One instance per profile.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
 #pragma once
@@ skipping 42 matching lines @@
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Returns the default setting for a particular content type. If |provider_id|
   // is not NULL, the id of the provider which provided the default setting is
   // assigned to it.
   //
   // This may be called on any thread.
   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
   // converted to a |ContentSetting|, |GetContentSettingValue| should be called.
   // If there is no content setting, returns CONTENT_SETTING_DEFAULT.
   //
   // May be called on any thread.
   ContentSetting GetContentSetting(
       const GURL& primary_url,
       const GURL& secondary_url,
       ContentSettingsType content_type,
       const std::string& resource_identifier) const;
 
   // Returns a single content setting |Value| which applies to the given URLs.
   // If |primary_pattern| and |secondary_pattern| are not NULL, they are set to
   // the patterns of the applying rule.
   // Note that certain internal schemes are whitelisted.
   // If there is no content setting, returns NULL and leaves |primary_pattern|
   // and |secondary_pattern| unchanged.
   // Otherwise transfers ownership of the resulting |Value| to the caller.
   // May be called on any thread.
   base::Value* GetContentSettingValue(
       const GURL& primary_url,
       const GURL& secondary_url,
       ContentSettingsType content_type,
       const std::string& resource_identifier,
       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.
   //
   // This may be called on any thread.
   void GetSettingsForOneType(ContentSettingsType content_type,
                              const std::string& resource_identifier,
                              ContentSettingsForOneType* settings) const;
 
   // Sets the default setting for a particular content type. This method must
@@ skipping 101 matching lines @@
   // Content setting providers.
   ProviderMap content_settings_providers_;
 
   // Used around accesses to the following objects to guarantee thread safety.
   mutable base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_