Index: ios/chrome/browser/net/ios_chrome_url_request_context_getter.cc |
diff --git a/ios/chrome/browser/net/ios_chrome_url_request_context_getter.cc b/ios/chrome/browser/net/ios_chrome_url_request_context_getter.cc |
index 0c53bc14d8e68ac5812376cb023aaae05f7cfd8d..cabb9421197575cce73f8e0dc0895df9885e058e 100644 |
--- a/ios/chrome/browser/net/ios_chrome_url_request_context_getter.cc |
+++ b/ios/chrome/browser/net/ios_chrome_url_request_context_getter.cc |
@@ -7,6 +7,7 @@ |
#include "base/bind.h" |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/message_loop/message_loop.h" |
#include "ios/chrome/browser/browser_state/chrome_browser_state_io_data.h" |
#include "ios/chrome/browser/ios_chrome_io_thread.h" |
@@ -83,7 +84,7 @@ class FactoryForIsolatedApp : public IOSChromeURLRequestContextFactory { |
// ---------------------------------------------------------------------------- |
IOSChromeURLRequestContextGetter::IOSChromeURLRequestContextGetter( |
- scoped_ptr<IOSChromeURLRequestContextFactory> factory) |
+ std::unique_ptr<IOSChromeURLRequestContextFactory> factory) |
: factory_(std::move(factory)), url_request_context_(nullptr) { |
DCHECK(factory_); |
} |
@@ -126,7 +127,7 @@ IOSChromeURLRequestContextGetter* IOSChromeURLRequestContextGetter::Create( |
const ChromeBrowserStateIOData* io_data, |
ProtocolHandlerMap* protocol_handlers) { |
return new IOSChromeURLRequestContextGetter( |
- make_scoped_ptr(new FactoryForMain(io_data, protocol_handlers))); |
+ base::WrapUnique(new FactoryForMain(io_data, protocol_handlers))); |
} |
// static |
@@ -135,6 +136,6 @@ IOSChromeURLRequestContextGetter::CreateForIsolatedApp( |
net::URLRequestContextGetter* main_context, |
const ChromeBrowserStateIOData* io_data, |
const base::FilePath& partition_path) { |
- return new IOSChromeURLRequestContextGetter(make_scoped_ptr( |
+ return new IOSChromeURLRequestContextGetter(base::WrapUnique( |
new FactoryForIsolatedApp(io_data, partition_path, main_context))); |
} |