Index: android_webview/browser/net/aw_cookie_store_wrapper.cc |
diff --git a/android_webview/browser/net/aw_cookie_store_wrapper.cc b/android_webview/browser/net/aw_cookie_store_wrapper.cc |
index f7264483abb15d0787bde3c8cfa4867810593bce..2c4531f35df4d85d67d8ea6239420303c919a641 100644 |
--- a/android_webview/browser/net/aw_cookie_store_wrapper.cc |
+++ b/android_webview/browser/net/aw_cookie_store_wrapper.cc |
@@ -29,7 +29,7 @@ class SubscriptionWrapper { |
public: |
SubscriptionWrapper() : weak_factory_(this) {} |
- scoped_ptr<net::CookieStore::CookieChangedSubscription> Subscribe( |
+ std::unique_ptr<net::CookieStore::CookieChangedSubscription> Subscribe( |
const GURL& url, |
const std::string& name, |
const net::CookieStore::CookieChangedCallback& callback) { |
@@ -79,7 +79,7 @@ class SubscriptionWrapper { |
base::WeakPtr<SubscriptionWrapper> subscription_wrapper_; |
scoped_refptr<base::TaskRunner> client_task_runner_; |
- scoped_ptr<net::CookieStore::CookieChangedSubscription> subscription_; |
+ std::unique_ptr<net::CookieStore::CookieChangedSubscription> subscription_; |
DISALLOW_COPY_AND_ASSIGN(NestedSubscription); |
}; |
@@ -318,7 +318,7 @@ void AwCookieStoreWrapper::SetForceKeepSessionState() { |
base::Bind(&SetForceKeepSessionStateOnCookieThread)); |
} |
-scoped_ptr<net::CookieStore::CookieChangedSubscription> |
+std::unique_ptr<net::CookieStore::CookieChangedSubscription> |
AwCookieStoreWrapper::AddCallbackForCookie( |
const GURL& url, |
const std::string& name, |