Convert Pass()→std::move() in //android_webview

android_webview/native/cookie_manager.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/cookie_manager.h"
 
+#include <utility>
+
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_cookie_access_policy.h"
 #include "android_webview/browser/net/init_native_callback.h"
 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
 #include "base/android/jni_string.h"
 #include "base/android/path_utils.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
@@ skipping 316 matching lines @@
 
 bool CookieManager::GetShouldAcceptCookies() {
   return AwCookieAccessPolicy::GetInstance()->GetShouldAcceptCookies();
 }
 
 void CookieManager::SetCookie(
     const GURL& host,
     const std::string& cookie_value,
     scoped_ptr<BoolCookieCallbackHolder> callback_holder) {
   BoolCallback callback =
-      BoolCookieCallbackHolder::ConvertToCallback(callback_holder.Pass());
+      BoolCookieCallbackHolder::ConvertToCallback(std::move(callback_holder));
   ExecCookieTask(base::Bind(&CookieManager::SetCookieHelper,
                             base::Unretained(this),
                             host,
                             cookie_value,
                             callback));
 }
 
 void CookieManager::SetCookieSync(const GURL& host,
                               const std::string& cookie_value) {
   ExecCookieTaskSync(base::Bind(&CookieManager::SetCookieHelper,
@@ skipping 41 matching lines @@
 void CookieManager::GetCookieValueCompleted(base::Closure complete,
                                             std::string* result,
                                             const std::string& value) {
   *result = value;
   complete.Run();
 }
 
 void CookieManager::RemoveSessionCookies(
     scoped_ptr<BoolCookieCallbackHolder> callback_holder) {
   BoolCallback callback =
-      BoolCookieCallbackHolder::ConvertToCallback(callback_holder.Pass());
+      BoolCookieCallbackHolder::ConvertToCallback(std::move(callback_holder));
   ExecCookieTask(base::Bind(&CookieManager::RemoveSessionCookiesHelper,
                             base::Unretained(this),
                             callback));
 }
 
 void CookieManager::RemoveSessionCookiesSync() {
   ExecCookieTaskSync(base::Bind(&CookieManager::RemoveSessionCookiesHelper,
                             base::Unretained(this)));
 }
 
 void CookieManager::RemoveSessionCookiesHelper(
     BoolCallback callback) {
   cookie_monster_->DeleteSessionCookiesAsync(
       base::Bind(&CookieManager::RemoveCookiesCompleted,
                  base::Unretained(this),
                  callback));
 }
 
 void CookieManager::RemoveCookiesCompleted(
     BoolCallback callback,
     int num_deleted) {
   callback.Run(num_deleted > 0);
 }
 
 void CookieManager::RemoveAllCookies(
     scoped_ptr<BoolCookieCallbackHolder> callback_holder) {
   BoolCallback callback =
-      BoolCookieCallbackHolder::ConvertToCallback(callback_holder.Pass());
+      BoolCookieCallbackHolder::ConvertToCallback(std::move(callback_holder));
   ExecCookieTask(base::Bind(&CookieManager::RemoveAllCookiesHelper,
                             base::Unretained(this),
                             callback));
 }
 
 void CookieManager::RemoveAllCookiesSync() {
   ExecCookieTaskSync(base::Bind(&CookieManager::RemoveAllCookiesHelper,
                             base::Unretained(this)));
 }
 
@@ skipping 81 matching lines @@
 
 static void SetCookie(JNIEnv* env,
                       const JavaParamRef<jobject>& obj,
                       const JavaParamRef<jstring>& url,
                       const JavaParamRef<jstring>& value,
                       const JavaParamRef<jobject>& java_callback) {
   GURL host(ConvertJavaStringToUTF16(env, url));
   std::string cookie_value(ConvertJavaStringToUTF8(env, value));
   scoped_ptr<BoolCookieCallbackHolder> callback(
       new BoolCookieCallbackHolder(env, java_callback));
-  CookieManager::GetInstance()->SetCookie(host, cookie_value, callback.Pass());
+  CookieManager::GetInstance()->SetCookie(host, cookie_value,
+                                          std::move(callback));
 }
 
 static void SetCookieSync(JNIEnv* env,
                           const JavaParamRef<jobject>& obj,
                           const JavaParamRef<jstring>& url,
                           const JavaParamRef<jstring>& value) {
   GURL host(ConvertJavaStringToUTF16(env, url));
   std::string cookie_value(ConvertJavaStringToUTF8(env, value));
 
   CookieManager::GetInstance()->SetCookieSync(host, cookie_value);
 }
 
 static ScopedJavaLocalRef<jstring> GetCookie(JNIEnv* env,
                                              const JavaParamRef<jobject>& obj,
                                              const JavaParamRef<jstring>& url) {
   GURL host(ConvertJavaStringToUTF16(env, url));
 
   return base::android::ConvertUTF8ToJavaString(
       env, CookieManager::GetInstance()->GetCookie(host));
 }
 
 static void RemoveSessionCookies(JNIEnv* env,
                                  const JavaParamRef<jobject>& obj,
                                  const JavaParamRef<jobject>& java_callback) {
   scoped_ptr<BoolCookieCallbackHolder> callback(
       new BoolCookieCallbackHolder(env, java_callback));
-  CookieManager::GetInstance()->RemoveSessionCookies(callback.Pass());
+  CookieManager::GetInstance()->RemoveSessionCookies(std::move(callback));
 }
 
 static void RemoveSessionCookiesSync(JNIEnv* env,
                                      const JavaParamRef<jobject>& obj) {
     CookieManager::GetInstance()->RemoveSessionCookiesSync();
 }
 
 static void RemoveAllCookies(JNIEnv* env,
                              const JavaParamRef<jobject>& obj,
                              const JavaParamRef<jobject>& java_callback) {
   scoped_ptr<BoolCookieCallbackHolder> callback(
       new BoolCookieCallbackHolder(env, java_callback));
-  CookieManager::GetInstance()->RemoveAllCookies(callback.Pass());
+  CookieManager::GetInstance()->RemoveAllCookies(std::move(callback));
 }
 
 static void RemoveAllCookiesSync(JNIEnv* env,
                                  const JavaParamRef<jobject>& obj) {
   CookieManager::GetInstance()->RemoveAllCookiesSync();
 }
 
 static void RemoveExpiredCookies(JNIEnv* env,
                                  const JavaParamRef<jobject>& obj) {
   CookieManager::GetInstance()->RemoveExpiredCookies();
@@ skipping 21 matching lines @@
 scoped_refptr<net::CookieStore> CreateCookieStore(
     AwBrowserContext* browser_context) {
   return CookieManager::GetInstance()->GetCookieStore();
 }
 
 bool RegisterCookieManager(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // android_webview namespace