Index: ios/chrome/browser/net/ios_chrome_url_request_context_getter.h |
diff --git a/ios/chrome/browser/net/ios_chrome_url_request_context_getter.h b/ios/chrome/browser/net/ios_chrome_url_request_context_getter.h |
index 531490d9c7d8c01947e143b7698d0c342de9bc48..9e8cc8fd4953c71c1c706f22e7ae102f22314f27 100644 |
--- a/ios/chrome/browser/net/ios_chrome_url_request_context_getter.h |
+++ b/ios/chrome/browser/net/ios_chrome_url_request_context_getter.h |
@@ -5,8 +5,9 @@ |
#ifndef IOS_CHROME_BROWSER_NET_IOS_CHROME_URL_REQUEST_CONTEXT_GETTER_H_ |
#define IOS_CHROME_BROWSER_NET_IOS_CHROME_URL_REQUEST_CONTEXT_GETTER_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "ios/chrome/browser/net/net_types.h" |
#include "net/url_request/url_request_context.h" |
#include "net/url_request/url_request_context_getter.h" |
@@ -25,7 +26,7 @@ class IOSChromeURLRequestContextGetter : public net::URLRequestContextGetter { |
// Constructs a ChromeURLRequestContextGetter that will use |factory| to |
// create the URLRequestContext. |
explicit IOSChromeURLRequestContextGetter( |
- scoped_ptr<IOSChromeURLRequestContextFactory> factory); |
+ std::unique_ptr<IOSChromeURLRequestContextFactory> factory); |
// Note that GetURLRequestContext() can only be called from the IO |
// thread (it will assert otherwise). |
@@ -58,7 +59,7 @@ class IOSChromeURLRequestContextGetter : public net::URLRequestContextGetter { |
// Deferred logic for creating a URLRequestContext. |
// Access only from the IO thread. |
- scoped_ptr<IOSChromeURLRequestContextFactory> factory_; |
+ std::unique_ptr<IOSChromeURLRequestContextFactory> factory_; |
// NULL before initialization and after invalidation. |
// Otherwise, it is the URLRequestContext instance that |