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

Unified Diff: google_apis/gcm/engine/gcm_store_impl.cc

Issue 1547233002: Convert Pass()→std::move() in //google_apis (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: google_apis/gcm/engine/gcm_store_impl.cc
diff --git a/google_apis/gcm/engine/gcm_store_impl.cc b/google_apis/gcm/engine/gcm_store_impl.cc
index e3127b95977d1a81c5ab665ced345650ef3111f1..49939b5b261259a4319c27f2c9a9819c0dbc4a17 100644
--- a/google_apis/gcm/engine/gcm_store_impl.cc
+++ b/google_apis/gcm/engine/gcm_store_impl.cc
@@ -4,6 +4,8 @@
#include "google_apis/gcm/engine/gcm_store_impl.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/callback.h"
#include "base/files/file_path.h"
@@ -271,8 +273,7 @@ GCMStoreImpl::Backend::Backend(
scoped_ptr<Encryptor> encryptor)
: path_(path),
foreground_task_runner_(foreground_task_runner),
- encryptor_(encryptor.Pass()) {
-}
+ encryptor_(std::move(encryptor)) {}
GCMStoreImpl::Backend::~Backend() {}
@@ -1165,10 +1166,9 @@ GCMStoreImpl::GCMStoreImpl(
scoped_ptr<Encryptor> encryptor)
: backend_(new Backend(path,
base::ThreadTaskRunnerHandle::Get(),
- encryptor.Pass())),
+ std::move(encryptor))),
blocking_task_runner_(blocking_task_runner),
- weak_ptr_factory_(this) {
-}
+ weak_ptr_factory_(this) {}
GCMStoreImpl::~GCMStoreImpl() {}
@@ -1430,7 +1430,7 @@ void GCMStoreImpl::LoadContinuation(const LoadCallback& callback,
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"477117 GCMStoreImpl::LoadContinuation"));
if (!result->success) {
- callback.Run(result.Pass());
+ callback.Run(std::move(result));
return;
}
int num_throttled_apps = 0;
@@ -1448,7 +1448,7 @@ void GCMStoreImpl::LoadContinuation(const LoadCallback& callback,
num_throttled_apps++;
}
UMA_HISTOGRAM_COUNTS("GCM.NumThrottledApps", num_throttled_apps);
- callback.Run(result.Pass());
+ callback.Run(std::move(result));
}
void GCMStoreImpl::AddOutgoingMessageContinuation(
« no previous file with comments | « google_apis/gcm/engine/fake_connection_handler.cc ('k') | google_apis/gcm/engine/gcm_store_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698