Add content_settings::PrefProvider to HostContentSettingsMap.

chrome/browser/content_settings/mock_content_settings_provider.h

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..bebfb8c56068868482628111f88e1107a104b9e8 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,21 @@ 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);
+};
+

[jochen (gone - plz use gerrit), 2011/02/04 08:38:43]

only one empty line here

[markusheintz_, 2011/02/04 10:08:03]

Done.

+
+class MockProvider : public ProviderInterface {
+ public:
+  MockProvider();
+  virtual ~MockProvider();
+
   // ProviderInterface implementation
   virtual ContentSetting GetContentSetting(
       const GURL& requesting_url,
@@ -51,15 +65,13 @@ class MockContentSettingsProvider : public DefaultProviderInterface,
       const ResourceIdentifier& resource_identifier,
       Rules* content_setting_rules) const {}
 
-  virtual void ClearAllContentSettingsRules() {}
+  virtual void ClearAllContentSettingsRules(
+      ContentSettingsType content_type) {}
 
- private:
-  ContentSettingsType content_type_;
-  ContentSetting setting_;
-  bool is_managed_;
-  bool can_override_;
+  virtual void ResetToDefaults() {}
 
-  DISALLOW_COPY_AND_ASSIGN(MockContentSettingsProvider);
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MockProvider);

[jochen (gone - plz use gerrit), 2011/02/04 08:38:43]

empty line before this line

[markusheintz_, 2011/02/04 10:08:03]

Done.

 };
 
 }  // namespace content_settings