Index: ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm |
diff --git a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm |
index 4a5da6f83ad3d646049254ba4ce0bcd5e41f1ae0..bfdc7ff6f18f88caf024b0e1a3d9f79d10ec9449 100644 |
--- a/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm |
+++ b/ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm |
@@ -132,9 +132,10 @@ void OffTheRecordChromeBrowserStateIOData::Handle::LazyInitialize() const { |
nullptr, CFNotificationSuspensionBehaviorCoalesce); |
} |
-scoped_ptr<ChromeBrowserStateIOData::IOSChromeURLRequestContextGetterVector> |
+std::unique_ptr< |
+ ChromeBrowserStateIOData::IOSChromeURLRequestContextGetterVector> |
OffTheRecordChromeBrowserStateIOData::Handle::GetAllContextGetters() { |
- scoped_ptr<IOSChromeURLRequestContextGetterVector> context_getters( |
+ std::unique_ptr<IOSChromeURLRequestContextGetterVector> context_getters( |
new IOSChromeURLRequestContextGetterVector()); |
if (main_request_context_getter_.get()) |
context_getters->push_back(main_request_context_getter_); |
@@ -149,7 +150,7 @@ OffTheRecordChromeBrowserStateIOData::OffTheRecordChromeBrowserStateIOData() |
OffTheRecordChromeBrowserStateIOData::~OffTheRecordChromeBrowserStateIOData() {} |
void OffTheRecordChromeBrowserStateIOData::InitializeInternal( |
- scoped_ptr<IOSChromeNetworkDelegate> chrome_network_delegate, |
+ std::unique_ptr<IOSChromeNetworkDelegate> chrome_network_delegate, |
ProfileParams* profile_params, |
ProtocolHandlerMap* protocol_handlers) const { |
net::URLRequestContext* main_context = main_request_context(); |
@@ -178,7 +179,7 @@ void OffTheRecordChromeBrowserStateIOData::InitializeInternal( |
io_thread_globals->url_request_backoff_manager.get()); |
// For incognito, we use the default non-persistent HttpServerPropertiesImpl. |
- set_http_server_properties(scoped_ptr<net::HttpServerProperties>( |
+ set_http_server_properties(std::unique_ptr<net::HttpServerProperties>( |
new net::HttpServerPropertiesImpl())); |
main_context->set_http_server_properties(http_server_properties()); |
@@ -211,7 +212,7 @@ void OffTheRecordChromeBrowserStateIOData::InitializeInternal( |
main_context->set_http_transaction_factory(main_http_factory_.get()); |
- scoped_ptr<net::URLRequestJobFactoryImpl> main_job_factory( |
+ std::unique_ptr<net::URLRequestJobFactoryImpl> main_job_factory( |
new net::URLRequestJobFactoryImpl()); |
InstallProtocolHandlers(main_job_factory.get(), protocol_handlers); |