Convert //android_webview to use std::unique_ptr

android_webview/native/cookie_manager.cc

Index: android_webview/native/cookie_manager.cc
diff --git a/android_webview/native/cookie_manager.cc b/android_webview/native/cookie_manager.cc
index edbd83ac4758fac4e1219275056a58f510a39374..e741cc4ca6d28631040c690656b7755c27bc1982 100644
--- a/android_webview/native/cookie_manager.cc
+++ b/android_webview/native/cookie_manager.cc
@@ -4,6 +4,7 @@
 
 #include "android_webview/native/cookie_manager.h"
 
+#include <memory>
 #include <utility>
 #include <vector>
 
@@ -22,7 +23,6 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
@@ -83,7 +83,7 @@ class BoolCookieCallbackHolder {
   }
 
   static BoolCallback ConvertToCallback(
-      scoped_ptr<BoolCookieCallbackHolder> me) {
+      std::unique_ptr<BoolCookieCallbackHolder> me) {
     return base::Bind(&BoolCookieCallbackHolder::Invoke,
                       base::Owned(me.release()));
   }
@@ -167,11 +167,11 @@ class CookieManager {
   bool GetShouldAcceptCookies();
   void SetCookie(const GURL& host,
                  const std::string& cookie_value,
-                 scoped_ptr<BoolCookieCallbackHolder> callback);
+                 std::unique_ptr<BoolCookieCallbackHolder> callback);
   void SetCookieSync(const GURL& host, const std::string& cookie_value);
   std::string GetCookie(const GURL& host);
-  void RemoveSessionCookies(scoped_ptr<BoolCookieCallbackHolder> callback);
-  void RemoveAllCookies(scoped_ptr<BoolCookieCallbackHolder> callback);
+  void RemoveSessionCookies(std::unique_ptr<BoolCookieCallbackHolder> callback);
+  void RemoveAllCookies(std::unique_ptr<BoolCookieCallbackHolder> callback);
   void RemoveAllCookiesSync();
   void RemoveSessionCookiesSync();
   void RemoveExpiredCookies();
@@ -226,7 +226,7 @@ class CookieManager {
   base::Thread cookie_store_backend_thread_;
 
   scoped_refptr<base::SingleThreadTaskRunner> cookie_store_task_runner_;
-  scoped_ptr<net::CookieStore> cookie_store_;
+  std::unique_ptr<net::CookieStore> cookie_store_;
 
   DISALLOW_COPY_AND_ASSIGN(CookieManager);
 };
@@ -357,7 +357,7 @@ bool CookieManager::GetShouldAcceptCookies() {
 void CookieManager::SetCookie(
     const GURL& host,
     const std::string& cookie_value,
-    scoped_ptr<BoolCookieCallbackHolder> callback_holder) {
+    std::unique_ptr<BoolCookieCallbackHolder> callback_holder) {
   BoolCallback callback =
       BoolCookieCallbackHolder::ConvertToCallback(std::move(callback_holder));
   ExecCookieTask(base::Bind(&CookieManager::SetCookieHelper,
@@ -414,7 +414,7 @@ void CookieManager::GetCookieValueCompleted(base::Closure complete,
 }
 
 void CookieManager::RemoveSessionCookies(
-    scoped_ptr<BoolCookieCallbackHolder> callback_holder) {
+    std::unique_ptr<BoolCookieCallbackHolder> callback_holder) {
   BoolCallback callback =
       BoolCookieCallbackHolder::ConvertToCallback(std::move(callback_holder));
   ExecCookieTask(base::Bind(&CookieManager::RemoveSessionCookiesHelper,
@@ -441,7 +441,7 @@ void CookieManager::RemoveCookiesCompleted(
 }
 
 void CookieManager::RemoveAllCookies(
-    scoped_ptr<BoolCookieCallbackHolder> callback_holder) {
+    std::unique_ptr<BoolCookieCallbackHolder> callback_holder) {
   BoolCallback callback =
       BoolCookieCallbackHolder::ConvertToCallback(std::move(callback_holder));
   ExecCookieTask(base::Bind(&CookieManager::RemoveAllCookiesHelper,
@@ -530,7 +530,7 @@ static void SetCookie(JNIEnv* env,
                       const JavaParamRef<jobject>& java_callback) {
   GURL host(ConvertJavaStringToUTF16(env, url));
   std::string cookie_value(ConvertJavaStringToUTF8(env, value));
-  scoped_ptr<BoolCookieCallbackHolder> callback(
+  std::unique_ptr<BoolCookieCallbackHolder> callback(
       new BoolCookieCallbackHolder(env, java_callback));
   CookieManager::GetInstance()->SetCookie(host, cookie_value,
                                           std::move(callback));
@@ -558,7 +558,7 @@ static ScopedJavaLocalRef<jstring> GetCookie(JNIEnv* env,
 static void RemoveSessionCookies(JNIEnv* env,
                                  const JavaParamRef<jobject>& obj,
                                  const JavaParamRef<jobject>& java_callback) {
-  scoped_ptr<BoolCookieCallbackHolder> callback(
+  std::unique_ptr<BoolCookieCallbackHolder> callback(
       new BoolCookieCallbackHolder(env, java_callback));
   CookieManager::GetInstance()->RemoveSessionCookies(std::move(callback));
 }
@@ -571,7 +571,7 @@ static void RemoveSessionCookiesSync(JNIEnv* env,
 static void RemoveAllCookies(JNIEnv* env,
                              const JavaParamRef<jobject>& obj,
                              const JavaParamRef<jobject>& java_callback) {
-  scoped_ptr<BoolCookieCallbackHolder> callback(
+  std::unique_ptr<BoolCookieCallbackHolder> callback(
       new BoolCookieCallbackHolder(env, java_callback));
   CookieManager::GetInstance()->RemoveAllCookies(std::move(callback));
 }