| Index: chrome/browser/content_settings/pref_content_settings_provider.h | 
| diff --git a/chrome/browser/content_settings/pref_content_settings_provider.h b/chrome/browser/content_settings/pref_content_settings_provider.h | 
| index 445e90c1b77d083c985c065ffe6493b5528c4bfb..230151b41bfa2d5da7bed64a6a0d0b7649a9ec95 100644 | 
| --- a/chrome/browser/content_settings/pref_content_settings_provider.h | 
| +++ b/chrome/browser/content_settings/pref_content_settings_provider.h | 
| @@ -20,11 +20,14 @@ class DictionaryValue; | 
| class PrefService; | 
| class Profile; | 
|  | 
| -class PrefContentSettingsProvider : public DefaultContentSettingsProvider, | 
| -                                    public NotificationObserver { | 
| +namespace content_settings { | 
| + | 
| +class PrefDefaultContentSettingsProvider | 
| +    : public DefaultContentSettingsProvider, | 
| +      public NotificationObserver { | 
| public: | 
| -  explicit PrefContentSettingsProvider(Profile* profile); | 
| -  virtual ~PrefContentSettingsProvider(); | 
| +  explicit PrefDefaultContentSettingsProvider(Profile* profile); | 
| +  virtual ~PrefDefaultContentSettingsProvider(); | 
|  | 
| // DefaultContentSettingsProvider implementation. | 
| virtual bool CanProvideDefaultSetting(ContentSettingsType content_type) const; | 
| @@ -82,7 +85,9 @@ class PrefContentSettingsProvider : public DefaultContentSettingsProvider, | 
| // notifications from the preferences service that we triggered ourself. | 
| bool updating_preferences_; | 
|  | 
| -  DISALLOW_COPY_AND_ASSIGN(PrefContentSettingsProvider); | 
| +  DISALLOW_COPY_AND_ASSIGN(PrefDefaultContentSettingsProvider); | 
| }; | 
|  | 
| +}  // namespace content_settings | 
| + | 
| #endif  // CHROME_BROWSER_CONTENT_SETTINGS_PREF_CONTENT_SETTINGS_PROVIDER_H_ | 
|  |