| Index: chrome/browser/profiles/profile_io_data.h
|
| diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
|
| index fcdf2a9fffae5083c0915c1782ead31a482d96a1..92813c6ea99ab2e7da53c81132e4ef84104886f3 100644
|
| --- a/chrome/browser/profiles/profile_io_data.h
|
| +++ b/chrome/browser/profiles/profile_io_data.h
|
| @@ -30,7 +30,6 @@ class ChromeHttpUserAgentSettings;
|
| class ChromeNetworkDelegate;
|
| class CookieSettings;
|
| class DesktopNotificationService;
|
| -class ExtensionInfoMap;
|
| class HostContentSettingsMap;
|
| class ManagedModeURLFilter;
|
| class Profile;
|
| @@ -43,6 +42,10 @@ class LoadTimeStats;
|
| class ResourcePrefetchPredictorObserver;
|
| }
|
|
|
| +namespace extensions {
|
| +class InfoMap;
|
| +}
|
| +
|
| namespace net {
|
| class CertVerifier;
|
| class CookieStore;
|
| @@ -113,7 +116,7 @@ class ProfileIOData {
|
| // These are useful when the Chrome layer is called from the content layer
|
| // with a content::ResourceContext, and they want access to Chrome data for
|
| // that profile.
|
| - ExtensionInfoMap* GetExtensionInfoMap() const;
|
| + extensions::InfoMap* GetExtensionInfoMap() const;
|
| CookieSettings* GetCookieSettings() const;
|
| HostContentSettingsMap* GetHostContentSettingsMap() const;
|
|
|
| @@ -250,7 +253,7 @@ class ProfileIOData {
|
| scoped_refptr<HostContentSettingsMap> host_content_settings_map;
|
| scoped_refptr<net::SSLConfigService> ssl_config_service;
|
| scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate;
|
| - scoped_refptr<ExtensionInfoMap> extension_info_map;
|
| + scoped_refptr<extensions::InfoMap> extension_info_map;
|
| scoped_ptr<chrome_browser_net::ResourcePrefetchPredictorObserver>
|
| resource_prefetch_predictor_observer_;
|
|
|
| @@ -488,7 +491,7 @@ class ProfileIOData {
|
| mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_;
|
|
|
| // Pointed to by URLRequestContext.
|
| - mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
|
| + mutable scoped_refptr<extensions::InfoMap> extension_info_map_;
|
| mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_;
|
| mutable scoped_ptr<ChromeNetworkDelegate> network_delegate_;
|
| mutable scoped_ptr<net::FraudulentCertificateReporter>
|
|
|