Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Unified Diff: ios/chrome/browser/browser_state/off_the_record_chrome_browser_state_io_data.mm

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 5643c43eeb60b99088845f1b4384e6668e606ad0..3a87bce2b7a68d5e05069d6914fa2d22a29c683a 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
@@ -128,9 +128,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_);
@@ -145,7 +146,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();
@@ -174,7 +175,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());
@@ -207,7 +208,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);

Powered by Google App Engine
This is Rietveld 408576698