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

Unified Diff: chrome/browser/net/nss_context_chromeos.cc

Issue 1552863003: Global conversion of Pass()→std::move(): CrOS edition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months 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/net/nss_context_chromeos.cc
diff --git a/chrome/browser/net/nss_context_chromeos.cc b/chrome/browser/net/nss_context_chromeos.cc
index 045e6ff1dee7684aba6b616c53d1cd47f73119b6..3841eb2f76760fa9ae750842398c4b1880dbbaf1 100644
--- a/chrome/browser/net/nss_context_chromeos.cc
+++ b/chrome/browser/net/nss_context_chromeos.cc
@@ -4,6 +4,8 @@
#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"
@@ -28,7 +30,7 @@ class NSSCertDatabaseChromeOSManager : public base::SupportsUserData::Data {
base::Bind(&NSSCertDatabaseChromeOSManager::DidGetPrivateSlot,
weak_ptr_factory_.GetWeakPtr())));
if (private_slot)
- DidGetPrivateSlot(private_slot.Pass());
+ DidGetPrivateSlot(std::move(private_slot));
}
~NSSCertDatabaseChromeOSManager() override {
@@ -53,7 +55,7 @@ class NSSCertDatabaseChromeOSManager : public base::SupportsUserData::Data {
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_);
@@ -99,7 +101,7 @@ void CallWithNSSCertDatabase(
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,
@@ -142,5 +144,5 @@ void EnableNSSSystemKeySlotForResourceContext(
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));
}

Powered by Google App Engine
This is Rietveld 408576698