| Index: chrome/browser/profiles/profile_impl_io_data.h
|
| diff --git a/chrome/browser/profiles/profile_impl_io_data.h b/chrome/browser/profiles/profile_impl_io_data.h
|
| index e4197e49ee02ece9fb9f0b3d79a8dfc951cd0fc5..7201b2686405c0b85fe1b9b2288bc0ec2721a50d 100644
|
| --- a/chrome/browser/profiles/profile_impl_io_data.h
|
| +++ b/chrome/browser/profiles/profile_impl_io_data.h
|
| @@ -66,7 +66,7 @@ class ProfileImplIOData : public ProfileIOData {
|
| // these functions.
|
| scoped_refptr<ChromeURLRequestContextGetter> CreateMainRequestContextGetter(
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| - content::ProtocolHandlerScopedVector protocol_interceptors,
|
| + content::URLRequestInterceptorScopedVector request_interceptors,
|
| PrefService* local_state,
|
| IOThread* io_thread) const;
|
| scoped_refptr<ChromeURLRequestContextGetter>
|
| @@ -74,7 +74,8 @@ class ProfileImplIOData : public ProfileIOData {
|
| const base::FilePath& partition_path,
|
| bool in_memory,
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| - content::ProtocolHandlerScopedVector protocol_interceptors) const;
|
| + content::URLRequestInterceptorScopedVector
|
| + request_interceptors) const;
|
|
|
| content::ResourceContext* GetResourceContext() const;
|
| // GetResourceContextNoInit() does not call LazyInitialize() so it can be
|
| @@ -167,7 +168,7 @@ class ProfileImplIOData : public ProfileIOData {
|
| virtual void InitializeInternal(
|
| ProfileParams* profile_params,
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| - content::ProtocolHandlerScopedVector protocol_interceptors)
|
| + content::URLRequestInterceptorScopedVector request_interceptors)
|
| const OVERRIDE;
|
| virtual void InitializeExtensionsRequestContext(
|
| ProfileParams* profile_params) const OVERRIDE;
|
| @@ -177,7 +178,7 @@ class ProfileImplIOData : public ProfileIOData {
|
| scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
|
| protocol_handler_interceptor,
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| - content::ProtocolHandlerScopedVector protocol_interceptors)
|
| + content::URLRequestInterceptorScopedVector request_interceptors)
|
| const OVERRIDE;
|
| virtual ChromeURLRequestContext* InitializeMediaRequestContext(
|
| ChromeURLRequestContext* original_context,
|
| @@ -190,7 +191,7 @@ class ProfileImplIOData : public ProfileIOData {
|
| scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
|
| protocol_handler_interceptor,
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| - content::ProtocolHandlerScopedVector protocol_interceptors)
|
| + content::URLRequestInterceptorScopedVector request_interceptors)
|
| const OVERRIDE;
|
| virtual ChromeURLRequestContext*
|
| AcquireIsolatedMediaRequestContext(
|
|
|