Index: chrome/browser/content_settings/mock_content_settings_provider.h |
diff --git a/chrome/browser/content_settings/mock_content_settings_provider.h b/chrome/browser/content_settings/mock_content_settings_provider.h |
index 49fc448fa25b62067c99db725735d1b50a6c4285..09f0d21f04911d216e3d11d7d894666dc7369622 100644 |
--- a/chrome/browser/content_settings/mock_content_settings_provider.h |
+++ b/chrome/browser/content_settings/mock_content_settings_provider.h |
@@ -11,8 +11,7 @@ |
namespace content_settings { |
-class MockContentSettingsProvider : public DefaultProviderInterface, |
- public ProviderInterface { |
+class MockContentSettingsProvider : public DefaultProviderInterface { |
public: |
// Create a content settings provider that provides a given setting for a |
// given type. |
@@ -30,6 +29,20 @@ class MockContentSettingsProvider : public DefaultProviderInterface, |
virtual void ResetToDefaults(); |
virtual bool DefaultSettingIsManaged(ContentSettingsType content_type) const; |
+ private: |
+ ContentSettingsType content_type_; |
+ ContentSetting setting_; |
+ bool is_managed_; |
+ bool can_override_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(MockContentSettingsProvider); |
+}; |
+ |
+class MockProvider : public ProviderInterface { |
+ public: |
+ MockProvider(); |
+ virtual ~MockProvider(); |
+ |
// ProviderInterface implementation |
virtual ContentSetting GetContentSetting( |
const GURL& requesting_url, |
@@ -51,15 +64,14 @@ class MockContentSettingsProvider : public DefaultProviderInterface, |
const ResourceIdentifier& resource_identifier, |
Rules* content_setting_rules) const {} |
- virtual void ClearAllContentSettingsRules() {} |
+ virtual void ClearAllContentSettingsRules( |
+ ContentSettingsType content_type) {} |
+ |
+ virtual void ResetToDefaults() {} |
private: |
- ContentSettingsType content_type_; |
- ContentSetting setting_; |
- bool is_managed_; |
- bool can_override_; |
- DISALLOW_COPY_AND_ASSIGN(MockContentSettingsProvider); |
+ DISALLOW_COPY_AND_ASSIGN(MockProvider); |
}; |
} // namespace content_settings |