| Index: chrome/browser/content_settings/policy_content_settings_provider.h | 
| diff --git a/chrome/browser/content_settings/policy_content_settings_provider.h b/chrome/browser/content_settings/policy_content_settings_provider.h | 
| index 3aad0437cd97739eb427507fb4582f2031a2e49d..87da4711cfc6fc3614daf3a5c8579dd4e44dcbe6 100644 | 
| --- a/chrome/browser/content_settings/policy_content_settings_provider.h | 
| +++ b/chrome/browser/content_settings/policy_content_settings_provider.h | 
| @@ -20,11 +20,14 @@ class DictionaryValue; | 
| class PrefService; | 
| class Profile; | 
|  | 
| -class PolicyContentSettingsProvider : public DefaultContentSettingsProvider, | 
| -                                      public NotificationObserver { | 
| +namespace content_settings { | 
| + | 
| +class PolicyDefaultContentSettingsProvider | 
| +    : public DefaultContentSettingsProvider, | 
| +      public NotificationObserver { | 
| public: | 
| -  explicit PolicyContentSettingsProvider(Profile* profile); | 
| -  virtual ~PolicyContentSettingsProvider(); | 
| +  explicit PolicyDefaultContentSettingsProvider(Profile* profile); | 
| +  virtual ~PolicyDefaultContentSettingsProvider(); | 
|  | 
| // DefaultContentSettingsProvider implementation. | 
| virtual bool CanProvideDefaultSetting(ContentSettingsType content_type) const; | 
| @@ -72,7 +75,9 @@ class PolicyContentSettingsProvider : public DefaultContentSettingsProvider, | 
| PrefChangeRegistrar pref_change_registrar_; | 
| NotificationRegistrar notification_registrar_; | 
|  | 
| -  DISALLOW_COPY_AND_ASSIGN(PolicyContentSettingsProvider); | 
| +  DISALLOW_COPY_AND_ASSIGN(PolicyDefaultContentSettingsProvider); | 
| }; | 
|  | 
| +}  // namespace content_settings | 
| + | 
| #endif  // CHROME_BROWSER_CONTENT_SETTINGS_POLICY_CONTENT_SETTINGS_PROVIDER_H_ | 
|  |