| 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 27125b5d59433146ad5317e7a21900c6fddf0ece..a4bb5f68c7a18125c51468b895c10ae1707ae622 100644
|
| --- a/chrome/browser/profiles/profile_impl_io_data.h
|
| +++ b/chrome/browser/profiles/profile_impl_io_data.h
|
| @@ -149,7 +149,7 @@ class ProfileImplIOData : public ProfileIOData {
|
| DISALLOW_COPY_AND_ASSIGN(Handle);
|
| };
|
|
|
| - virtual bool IsDataReductionProxyEnabled() const override;
|
| + bool IsDataReductionProxyEnabled() const override;
|
|
|
| BooleanPrefMember* data_reduction_proxy_enabled() const {
|
| return &data_reduction_proxy_enabled_;
|
| @@ -176,41 +176,37 @@ class ProfileImplIOData : public ProfileIOData {
|
| };
|
|
|
| ProfileImplIOData();
|
| - virtual ~ProfileImplIOData();
|
| + ~ProfileImplIOData() override;
|
|
|
| - virtual void InitializeInternal(
|
| - ProfileParams* profile_params,
|
| - content::ProtocolHandlerMap* protocol_handlers,
|
| - content::URLRequestInterceptorScopedVector request_interceptors)
|
| - const override;
|
| - virtual void InitializeExtensionsRequestContext(
|
| + void InitializeInternal(ProfileParams* profile_params,
|
| + content::ProtocolHandlerMap* protocol_handlers,
|
| + content::URLRequestInterceptorScopedVector
|
| + request_interceptors) const override;
|
| + void InitializeExtensionsRequestContext(
|
| ProfileParams* profile_params) const override;
|
| - virtual net::URLRequestContext* InitializeAppRequestContext(
|
| + net::URLRequestContext* InitializeAppRequestContext(
|
| net::URLRequestContext* main_context,
|
| const StoragePartitionDescriptor& partition_descriptor,
|
| scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
|
| protocol_handler_interceptor,
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| content::URLRequestInterceptorScopedVector request_interceptors)
|
| - const override;
|
| - virtual net::URLRequestContext* InitializeMediaRequestContext(
|
| + const override;
|
| + net::URLRequestContext* InitializeMediaRequestContext(
|
| net::URLRequestContext* original_context,
|
| const StoragePartitionDescriptor& partition_descriptor) const override;
|
| - virtual net::URLRequestContext*
|
| - AcquireMediaRequestContext() const override;
|
| - virtual net::URLRequestContext* AcquireIsolatedAppRequestContext(
|
| + net::URLRequestContext* AcquireMediaRequestContext() const override;
|
| + net::URLRequestContext* AcquireIsolatedAppRequestContext(
|
| net::URLRequestContext* main_context,
|
| const StoragePartitionDescriptor& partition_descriptor,
|
| scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
|
| protocol_handler_interceptor,
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| content::URLRequestInterceptorScopedVector request_interceptors)
|
| - const override;
|
| - virtual net::URLRequestContext*
|
| - AcquireIsolatedMediaRequestContext(
|
| - net::URLRequestContext* app_context,
|
| - const StoragePartitionDescriptor& partition_descriptor)
|
| - const override;
|
| + const override;
|
| + net::URLRequestContext* AcquireIsolatedMediaRequestContext(
|
| + net::URLRequestContext* app_context,
|
| + const StoragePartitionDescriptor& partition_descriptor) const override;
|
|
|
| // Deletes all network related data since |time|. It deletes transport
|
| // security state since |time| and also deletes HttpServerProperties data.
|
|
|