| Index: chrome/browser/profiles/off_the_record_profile_io_data.h
|
| diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.h b/chrome/browser/profiles/off_the_record_profile_io_data.h
|
| index 7014006856b649aaa39ea89e0a388ded0672b92d..0675b89e84cf24066f63c1d33f350c09390ca070 100644
|
| --- a/chrome/browser/profiles/off_the_record_profile_io_data.h
|
| +++ b/chrome/browser/profiles/off_the_record_profile_io_data.h
|
| @@ -107,41 +107,37 @@ class OffTheRecordProfileIOData : public ProfileIOData {
|
| friend class base::RefCountedThreadSafe<OffTheRecordProfileIOData>;
|
|
|
| explicit OffTheRecordProfileIOData(Profile::ProfileType profile_type);
|
| - virtual ~OffTheRecordProfileIOData();
|
| + ~OffTheRecordProfileIOData() 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;
|
|
|
| mutable scoped_ptr<net::HttpTransactionFactory> main_http_factory_;
|
| mutable scoped_ptr<net::FtpTransactionFactory> ftp_factory_;
|
|
|