| 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 19179161fc5e85492ad89fb969d83206b0c3fd0d..7014006856b649aaa39ea89e0a388ded0672b92d 100644
|
| --- a/chrome/browser/profiles/off_the_record_profile_io_data.h
|
| +++ b/chrome/browser/profiles/off_the_record_profile_io_data.h
|
| @@ -113,9 +113,9 @@ class OffTheRecordProfileIOData : public ProfileIOData {
|
| ProfileParams* profile_params,
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| content::URLRequestInterceptorScopedVector request_interceptors)
|
| - const OVERRIDE;
|
| + const override;
|
| virtual void InitializeExtensionsRequestContext(
|
| - ProfileParams* profile_params) const OVERRIDE;
|
| + ProfileParams* profile_params) const override;
|
| virtual net::URLRequestContext* InitializeAppRequestContext(
|
| net::URLRequestContext* main_context,
|
| const StoragePartitionDescriptor& partition_descriptor,
|
| @@ -123,12 +123,12 @@ class OffTheRecordProfileIOData : public ProfileIOData {
|
| protocol_handler_interceptor,
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| content::URLRequestInterceptorScopedVector request_interceptors)
|
| - const OVERRIDE;
|
| + const override;
|
| virtual net::URLRequestContext* InitializeMediaRequestContext(
|
| net::URLRequestContext* original_context,
|
| - const StoragePartitionDescriptor& partition_descriptor) const OVERRIDE;
|
| + const StoragePartitionDescriptor& partition_descriptor) const override;
|
| virtual net::URLRequestContext*
|
| - AcquireMediaRequestContext() const OVERRIDE;
|
| + AcquireMediaRequestContext() const override;
|
| virtual net::URLRequestContext* AcquireIsolatedAppRequestContext(
|
| net::URLRequestContext* main_context,
|
| const StoragePartitionDescriptor& partition_descriptor,
|
| @@ -136,12 +136,12 @@ class OffTheRecordProfileIOData : public ProfileIOData {
|
| protocol_handler_interceptor,
|
| content::ProtocolHandlerMap* protocol_handlers,
|
| content::URLRequestInterceptorScopedVector request_interceptors)
|
| - const OVERRIDE;
|
| + const override;
|
| virtual net::URLRequestContext*
|
| AcquireIsolatedMediaRequestContext(
|
| net::URLRequestContext* app_context,
|
| const StoragePartitionDescriptor& partition_descriptor)
|
| - const OVERRIDE;
|
| + const override;
|
|
|
| mutable scoped_ptr<net::HttpTransactionFactory> main_http_factory_;
|
| mutable scoped_ptr<net::FtpTransactionFactory> ftp_factory_;
|
|
|