ContentSettingsObserver (+ related classes) cleanup.

chrome/browser/content_settings/host_content_settings_map.cc

 // 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.
 
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
@@ skipping 134 matching lines @@
     }
   }
 
   // The method GetDefaultContentSetting always has to return an explicit
   // value that is to be used as default. We here rely on the
   // DefaultProvider to always provide a value.
   NOTREACHED();
   return CONTENT_SETTING_DEFAULT;
 }
 
-ContentSettings HostContentSettingsMap::GetDefaultContentSettings() const {
-  ContentSettings output(CONTENT_SETTING_DEFAULT);
-  for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
-    if (!ContentTypeHasCompoundValue(ContentSettingsType(i)))
-      output.settings[i] = GetDefaultContentSetting(ContentSettingsType(i),
-                                                    NULL);
-  }
-  return output;
-}
-
 ContentSetting HostContentSettingsMap::GetContentSetting(
     const GURL& primary_url,
     const GURL& secondary_url,
     ContentSettingsType content_type,
     const std::string& resource_identifier) const {
   scoped_ptr<base::Value> value(GetContentSettingValue(
       primary_url, secondary_url, content_type, resource_identifier,
       NULL, NULL));
   return content_settings::ValueToContentSetting(value.get());
 }
@@ skipping 20 matching lines @@
     base::Value* value = content_settings::GetContentSettingValueAndPatterns(
         provider->second, primary_url, secondary_url, content_type,
         resource_identifier, is_off_the_record_,
         primary_pattern, secondary_pattern);
     if (value)
       return value;
   }
   return NULL;
 }
 
-ContentSettings HostContentSettingsMap::GetContentSettings(
-    const GURL& primary_url) const {
-  ContentSettings output;
-  // If we require a resource identifier, set the content settings to default,
-  // otherwise make the defaults explicit. Values for content type
-  // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE can't be mapped to the type
-  // |ContentSetting|. So we ignore them here.
-  for (int j = 0; j < CONTENT_SETTINGS_NUM_TYPES; ++j) {
-    ContentSettingsType type = ContentSettingsType(j);
-    if (!ContentTypeHasCompoundValue(type)) {
-      output.settings[j] = GetContentSetting(
-          primary_url, primary_url, ContentSettingsType(j), std::string());
-    }
-  }
-  return output;
-}
-
 void HostContentSettingsMap::GetSettingsForOneType(
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     ContentSettingsForOneType* settings) const {
   DCHECK(content_settings::SupportsResourceIdentifier(content_type) ||
          resource_identifier.empty());
   DCHECK(settings);
 
   settings->clear();
   for (ConstProviderIterator provider = content_settings_providers_.begin();
@@ skipping 179 matching lines @@
   if (content_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS)
     return false;
   if (primary_url.SchemeIs(chrome::kExtensionScheme)) {
     return content_type != CONTENT_SETTINGS_TYPE_COOKIES ||
         secondary_url.SchemeIs(chrome::kExtensionScheme);
   }
   return primary_url.SchemeIs(chrome::kChromeDevToolsScheme) ||
          primary_url.SchemeIs(chrome::kChromeInternalScheme) ||
          primary_url.SchemeIs(chrome::kChromeUIScheme);
 }