Global conversion of Pass()→std::move(): CrOS edition

chrome/browser/net/nss_context_chromeos.cc

 // Copyright (c) 2013 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 "chrome/browser/net/nss_context.h"
 
+#include <utility>
+
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/supports_user_data.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "crypto/nss_util_internal.h"
 #include "net/cert/nss_cert_database_chromeos.h"
 
 namespace {
 
 void* kDatabaseManagerKey = &kDatabaseManagerKey;
 
 class NSSCertDatabaseChromeOSManager : public base::SupportsUserData::Data {
  public:
   typedef base::Callback<void(net::NSSCertDatabaseChromeOS*)>
       GetNSSCertDatabaseCallback;
   explicit NSSCertDatabaseChromeOSManager(const std::string& username_hash)
       : username_hash_(username_hash), weak_ptr_factory_(this) {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
     crypto::ScopedPK11Slot private_slot(crypto::GetPrivateSlotForChromeOSUser(
         username_hash,
         base::Bind(&NSSCertDatabaseChromeOSManager::DidGetPrivateSlot,
                    weak_ptr_factory_.GetWeakPtr())));
     if (private_slot)
-      DidGetPrivateSlot(private_slot.Pass());
+      DidGetPrivateSlot(std::move(private_slot));
   }
 
   ~NSSCertDatabaseChromeOSManager() override {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   }
 
   net::NSSCertDatabaseChromeOS* GetNSSCertDatabase(
       const GetNSSCertDatabaseCallback& callback) {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
     if (nss_cert_database_)
       return nss_cert_database_.get();
 
     ready_callback_list_.push_back(callback);
     return NULL;
   }
 
  private:
   typedef std::vector<GetNSSCertDatabaseCallback> ReadyCallbackList;
 
   void DidGetPrivateSlot(crypto::ScopedPK11Slot private_slot) {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
     nss_cert_database_.reset(new net::NSSCertDatabaseChromeOS(
         crypto::GetPublicSlotForChromeOSUser(username_hash_),
-        private_slot.Pass()));
+        std::move(private_slot)));
 
     ReadyCallbackList callback_list;
     callback_list.swap(ready_callback_list_);
     for (ReadyCallbackList::iterator i = callback_list.begin();
          i != callback_list.end();
          ++i) {
       (*i).Run(nss_cert_database_.get());
     }
   }
 
@@ skipping 25 matching lines @@
 }
 
 void CallWithNSSCertDatabase(
     const base::Callback<void(net::NSSCertDatabase*)>& callback,
     net::NSSCertDatabaseChromeOS* db) {
   callback.Run(db);
 }
 
 void SetSystemSlot(crypto::ScopedPK11Slot system_slot,
                    net::NSSCertDatabaseChromeOS* db) {
-  db->SetSystemSlot(system_slot.Pass());
+  db->SetSystemSlot(std::move(system_slot));
 }
 
 void SetSystemSlotOfDBForResourceContext(content::ResourceContext* context,
                                          crypto::ScopedPK11Slot system_slot) {
   base::Callback<void(net::NSSCertDatabaseChromeOS*)> callback =
       base::Bind(&SetSystemSlot, base::Passed(&system_slot));
 
   net::NSSCertDatabaseChromeOS* db =
       GetNSSCertDatabaseChromeOS(context, callback);
   if (db)
@@ skipping 22 matching lines @@
       context, base::Bind(&CallWithNSSCertDatabase, callback));
 }
 
 void EnableNSSSystemKeySlotForResourceContext(
     content::ResourceContext* context) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   base::Callback<void(crypto::ScopedPK11Slot)> callback =
       base::Bind(&SetSystemSlotOfDBForResourceContext, context);
   crypto::ScopedPK11Slot system_slot = crypto::GetSystemNSSKeySlot(callback);
   if (system_slot)
-    callback.Run(system_slot.Pass());
+    callback.Run(std::move(system_slot));
 }