Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3824)

Unified Diff: chrome/browser/ui/crypto_module_delegate_nss.cc

Issue 1550053002: Convert Pass()→std::move() in //chrome/browser/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/crypto_module_delegate_nss.cc
diff --git a/chrome/browser/ui/crypto_module_delegate_nss.cc b/chrome/browser/ui/crypto_module_delegate_nss.cc
index 1d7672a1f71110734e75c3160cfcfb24cea0a5fd..2bbbeefbe6df8127b56e66d25ec7793f7750a60d 100644
--- a/chrome/browser/ui/crypto_module_delegate_nss.cc
+++ b/chrome/browser/ui/crypto_module_delegate_nss.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/ui/crypto_module_delegate_nss.h"
+#include <utility>
+
#include "base/bind.h"
#include "chrome/browser/net/nss_context.h"
#include "content/public/browser/browser_thread.h"
@@ -22,7 +24,7 @@ void CreateWithSlot(chrome::CryptoModulePasswordReason reason,
return;
}
callback.Run(scoped_ptr<ChromeNSSCryptoModuleDelegate>(
- new ChromeNSSCryptoModuleDelegate(reason, server, slot.Pass())));
+ new ChromeNSSCryptoModuleDelegate(reason, server, std::move(slot))));
}
} // namespace
@@ -35,8 +37,7 @@ ChromeNSSCryptoModuleDelegate::ChromeNSSCryptoModuleDelegate(
server_(server),
event_(false, false),
cancelled_(false),
- slot_(slot.Pass()) {
-}
+ slot_(std::move(slot)) {}
ChromeNSSCryptoModuleDelegate::~ChromeNSSCryptoModuleDelegate() {}
@@ -56,12 +57,12 @@ void ChromeNSSCryptoModuleDelegate::CreateForResourceContext(
crypto::ScopedPK11Slot slot =
GetPrivateNSSKeySlotForResourceContext(context, get_slot_callback);
if (slot)
- get_slot_callback.Run(slot.Pass());
+ get_slot_callback.Run(std::move(slot));
}
// TODO(mattm): allow choosing which slot to generate and store the key.
crypto::ScopedPK11Slot ChromeNSSCryptoModuleDelegate::RequestSlot() {
- return slot_.Pass();
+ return std::move(slot_);
}
std::string ChromeNSSCryptoModuleDelegate::RequestPassword(

Powered by Google App Engine
This is Rietveld 408576698