Add content_settings::PrefProvider to HostContentSettingsMap.

chrome/browser/content_settings/mock_content_settings_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_MOCK_CONTENT_SETTINGS_PROVIDER_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_MOCK_CONTENT_SETTINGS_PROVIDER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
 
 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.
   MockContentSettingsProvider(ContentSettingsType content_type,
                               ContentSetting setting,
                               bool is_managed,
                               bool can_override);
   virtual ~MockContentSettingsProvider();
 
   // DefaultProviderInterface implementation.
   virtual ContentSetting ProvideDefaultSetting(
       ContentSettingsType content_type) const;
   virtual void UpdateDefaultSetting(ContentSettingsType content_type,
                                     ContentSetting setting);
   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,
       const GURL& embedding_url,
       ContentSettingsType content_type,
       const ResourceIdentifier& resource_identifier) const {
     return CONTENT_SETTING_DEFAULT;
   }
 
   virtual void SetContentSetting(
       const ContentSettingsPattern& requesting_url_pattern,
       const ContentSettingsPattern& embedding_url_pattern,
       ContentSettingsType content_type,
       const ResourceIdentifier& resource_identifier,
       ContentSetting content_setting) {}
 
   virtual void GetAllContentSettingsRules(
       ContentSettingsType content_type,
       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);

[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
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_MOCK_CONTENT_SETTINGS_PROVIDER_H_