| Index: chrome/browser/content_settings/host_content_settings_map.cc | 
| diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc | 
| index 0345e81991547f921dc933f754c50e5078ca6669..2ca370c15de3ab2780aafe93affd95e1aa8b7dad 100644 | 
| --- a/chrome/browser/content_settings/host_content_settings_map.cc | 
| +++ b/chrome/browser/content_settings/host_content_settings_map.cc | 
| @@ -26,6 +26,10 @@ | 
| #include "net/base/net_util.h" | 
| #include "net/base/static_cookie_policy.h" | 
|  | 
| +using content_settings::DefaultContentSettingsProviderInterface; | 
| +using content_settings::PrefDefaultContentSettingsProvider; | 
| +using content_settings::PolicyDefaultContentSettingsProvider; | 
| + | 
| namespace { | 
|  | 
| // The preference keys where resource identifiers are stored for | 
| @@ -88,7 +92,7 @@ ContentSetting ClickToPlayFixup(ContentSettingsType content_type, | 
| return setting; | 
| } | 
|  | 
| -typedef linked_ptr<DefaultContentSettingsProvider> | 
| +typedef linked_ptr<DefaultContentSettingsProviderInterface> | 
| DefaultContentSettingsProviderPtr; | 
| typedef std::vector<DefaultContentSettingsProviderPtr>::iterator | 
| provider_iterator; | 
| @@ -114,10 +118,10 @@ HostContentSettingsMap::HostContentSettingsMap(Profile* profile) | 
| // providers further up. | 
| default_content_settings_providers_.push_back( | 
| DefaultContentSettingsProviderPtr( | 
| -          new PrefContentSettingsProvider(profile))); | 
| +          new PrefDefaultContentSettingsProvider(profile))); | 
| default_content_settings_providers_.push_back( | 
| DefaultContentSettingsProviderPtr( | 
| -          new PolicyContentSettingsProvider(profile))); | 
| +          new PolicyDefaultContentSettingsProvider(profile))); | 
|  | 
| PrefService* prefs = profile_->GetPrefs(); | 
|  | 
|  |