ContentSettingsObserver (+ related classes) cleanup.

chrome/browser/content_settings/content_settings_default_provider.h

Index: chrome/browser/content_settings/content_settings_default_provider.h
diff --git a/chrome/browser/content_settings/content_settings_default_provider.h b/chrome/browser/content_settings/content_settings_default_provider.h
index f4a9c3410e49a6b9b17ce2c0c2d5ae6260225a8c..f9ddaffd135305d8cb0578de04b18f9d8e66b3e9 100644
--- a/chrome/browser/content_settings/content_settings_default_provider.h
+++ b/chrome/browser/content_settings/content_settings_default_provider.h
@@ -57,7 +57,7 @@ class DefaultProvider : public ObservableProvider,
  private:
   // Sets the fields of |settings| based on the values in |dictionary|.
   void GetSettingsFromDictionary(const base::DictionaryValue* dictionary,
-                                 ContentSettings* settings);
+                                 ContentSetting* settings);
 
   // Forces the default settings to be explicitly set instead of themselves
   // being CONTENT_SETTING_DEFAULT.
@@ -71,7 +71,7 @@ class DefaultProvider : public ObservableProvider,
   void MigrateObsoleteGeolocationPref();
 
   // Copies of the pref data, so that we can read it on the IO thread.
-  ContentSettings default_content_settings_;
+  ContentSetting default_content_settings_[CONTENT_SETTINGS_NUM_TYPES];
 
   PrefService* prefs_;