ContentSettingsObserver (+ related classes) cleanup.

chrome/browser/content_settings/content_settings_default_provider.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.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_DEFAULT_PROVIDER_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_DEFAULT_PROVIDER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 39 matching lines @@
   virtual void ShutdownOnUIThread() OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  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.
   void ForceDefaultsToBeExplicit();
 
   // Reads the default settings from the preferences service. If |overwrite| is
   // true and the preference is missing, the local copy will be cleared as well.
   void ReadDefaultSettings(bool overwrite);
 
   void MigrateObsoleteNotificationPref();
   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_;
 
   // Whether this settings map is for an Incognito session.
   bool is_incognito_;
 
   // Used around accesses to the |default_content_settings_| object to guarantee
   // thread safety.
   mutable base::Lock lock_;
 
   PrefChangeRegistrar pref_change_registrar_;
 
   // Whether we are currently updating preferences, this is used to ignore
   // notifications from the preferences service that we triggered ourself.
   bool updating_preferences_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultProvider);
 };
 
 }  // namespace content_settings
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_DEFAULT_PROVIDER_H_