Add ContentSettingsProvider Interface.

chrome/browser/content_settings/pref_content_settings_provider.cc

Index: chrome/browser/content_settings/pref_content_settings_provider.cc
diff --git a/chrome/browser/content_settings/pref_content_settings_provider.cc b/chrome/browser/content_settings/pref_content_settings_provider.cc
index 0afe1f91a4afdc869b0a1813c0415bd126bc8ab7..cc77bd4560d31043cfe545b05766804b6716b687 100644
--- a/chrome/browser/content_settings/pref_content_settings_provider.cc
+++ b/chrome/browser/content_settings/pref_content_settings_provider.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/content_settings/pref_content_settings_provider.h"
 
+#include <string>
+
 #include "base/command_line.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/content_settings/content_settings_details.h"
@@ -57,10 +59,13 @@ ContentSetting ClickToPlayFixup(ContentSettingsType content_type,
 
 }  // namespace
 
-PrefContentSettingsProvider::PrefContentSettingsProvider(Profile* profile)
-    : profile_(profile),
-      is_off_the_record_(profile_->IsOffTheRecord()),
-      updating_preferences_(false) {
+namespace content_settings {
+
+PrefDefaultContentSettingsProvider::
+    PrefDefaultContentSettingsProvider(Profile* profile)
+        : profile_(profile),

[Bernhard Bauer, 2011/01/27 09:54:26]

And here.

[markusheintz_, 2011/01/27 10:24:37]

Done.

+          is_off_the_record_(profile_->IsOffTheRecord()),
+          updating_preferences_(false) {
   PrefService* prefs = profile->GetPrefs();
 
   // Read global defaults.
@@ -74,22 +79,22 @@ PrefContentSettingsProvider::PrefContentSettingsProvider(Profile* profile)
                               Source<Profile>(profile_));
 }
 
-PrefContentSettingsProvider::~PrefContentSettingsProvider() {
+PrefDefaultContentSettingsProvider::~PrefDefaultContentSettingsProvider() {
   UnregisterObservers();
 }
 
-bool PrefContentSettingsProvider::CanProvideDefaultSetting(
+bool PrefDefaultContentSettingsProvider::CanProvideDefaultSetting(
     ContentSettingsType content_type) const {
   return true;
 }
 
-ContentSetting PrefContentSettingsProvider::ProvideDefaultSetting(
+ContentSetting PrefDefaultContentSettingsProvider::ProvideDefaultSetting(
     ContentSettingsType content_type) const {
   base::AutoLock lock(lock_);
   return default_content_settings_.settings[content_type];
 }
 
-void PrefContentSettingsProvider::UpdateDefaultSetting(
+void PrefDefaultContentSettingsProvider::UpdateDefaultSetting(
     ContentSettingsType content_type,
     ContentSetting setting) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -131,12 +136,12 @@ void PrefContentSettingsProvider::UpdateDefaultSetting(
       ContentSettingsDetails(ContentSettingsPattern(), content_type, ""));
 }
 
-bool PrefContentSettingsProvider::DefaultSettingIsManaged(
+bool PrefDefaultContentSettingsProvider::DefaultSettingIsManaged(
     ContentSettingsType content_type) const {
   return false;
 }
 
-void PrefContentSettingsProvider::ResetToDefaults() {
+void PrefDefaultContentSettingsProvider::ResetToDefaults() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   base::AutoLock lock(lock_);
   default_content_settings_ = ContentSettings();
@@ -150,7 +155,7 @@ void PrefContentSettingsProvider::ResetToDefaults() {
   }
 }
 
-void PrefContentSettingsProvider::Observe(NotificationType type,
+void PrefDefaultContentSettingsProvider::Observe(NotificationType type,
                                           const NotificationSource& source,
                                           const NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -180,7 +185,7 @@ void PrefContentSettingsProvider::Observe(NotificationType type,
   }
 }
 
-void PrefContentSettingsProvider::UnregisterObservers() {
+void PrefDefaultContentSettingsProvider::UnregisterObservers() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!profile_)
     return;
@@ -190,7 +195,7 @@ void PrefContentSettingsProvider::UnregisterObservers() {
   profile_ = NULL;
 }
 
-void PrefContentSettingsProvider::ReadDefaultSettings(bool overwrite) {
+void PrefDefaultContentSettingsProvider::ReadDefaultSettings(bool overwrite) {
   PrefService* prefs = profile_->GetPrefs();
   const DictionaryValue* default_settings_dictionary =
       prefs->GetDictionary(prefs::kDefaultContentSettings);
@@ -208,7 +213,7 @@ void PrefContentSettingsProvider::ReadDefaultSettings(bool overwrite) {
   ForceDefaultsToBeExplicit();
 }
 
-void PrefContentSettingsProvider::ForceDefaultsToBeExplicit() {
+void PrefDefaultContentSettingsProvider::ForceDefaultsToBeExplicit() {
   DCHECK_EQ(arraysize(kDefaultSettings),
             static_cast<size_t>(CONTENT_SETTINGS_NUM_TYPES));
 
@@ -218,7 +223,7 @@ void PrefContentSettingsProvider::ForceDefaultsToBeExplicit() {
   }
 }
 
-void PrefContentSettingsProvider::GetSettingsFromDictionary(
+void PrefDefaultContentSettingsProvider::GetSettingsFromDictionary(
     const DictionaryValue* dictionary,
     ContentSettings* settings) {
   for (DictionaryValue::key_iterator i(dictionary->begin_keys());
@@ -245,7 +250,7 @@ void PrefContentSettingsProvider::GetSettingsFromDictionary(
                        settings->settings[CONTENT_SETTINGS_TYPE_PLUGINS]);
 }
 
-void PrefContentSettingsProvider::NotifyObservers(
+void PrefDefaultContentSettingsProvider::NotifyObservers(
     const ContentSettingsDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (profile_ == NULL)
@@ -258,6 +263,8 @@ void PrefContentSettingsProvider::NotifyObservers(
 
 
 // static
-void PrefContentSettingsProvider::RegisterUserPrefs(PrefService* prefs) {
+void PrefDefaultContentSettingsProvider::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kDefaultContentSettings);
 }
+
+}  // namespace content_settings