Rename ContentSettingsProviderInterface to DefaultContentSettingsProviderInterface.

chrome/browser/content_settings/pref_content_settings_provider.h

 // Copyright (c) 2010 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_PREF_CONTENT_SETTINGS_PROVIDER_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_PREF_CONTENT_SETTINGS_PROVIDER_H_
 #pragma once
 
 // A content settings provider that takes its settings out of the pref service.
 
 #include "base/basictypes.h"
 #include "base/lock.h"
-#include "chrome/browser/content_settings/content_settings_provider.h"
+#include "chrome/browser/content_settings/default_content_settings_provider.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 
 class ContentSettingsDetails;
 class DictionaryValue;
 class PrefService;
 class Profile;
 
-class PrefContentSettingsProvider : public ContentSettingsProviderInterface,
-                                    public NotificationObserver {
+class PrefContentSettingsProvider :
+    public DefaultContentSettingsProviderInterface,

[Bernhard Bauer, 2011/01/25 13:11:19]

And here.

[markusheintz_, 2011/01/25 13:57:43]

Done.

+    public NotificationObserver {
  public:
   explicit PrefContentSettingsProvider(Profile* profile);
   virtual ~PrefContentSettingsProvider();
 
   // ContentSettingsProviderInterface implementation.
   virtual bool CanProvideDefaultSetting(ContentSettingsType content_type) const;
   virtual ContentSetting ProvideDefaultSetting(
       ContentSettingsType content_type) const;
   virtual void UpdateDefaultSetting(ContentSettingsType content_type,
                                     ContentSetting setting);
@@ skipping 44 matching lines @@
   NotificationRegistrar notification_registrar_;
 
   // Whether we are currently updating preferences, this is used to ignore
   // notifications from the preferences service that we triggered ourself.
   bool updating_preferences_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefContentSettingsProvider);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_PREF_CONTENT_SETTINGS_PROVIDER_H_