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

Unified Diff: google_apis/gcm/engine/heartbeat_manager.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
« no previous file with comments | « google_apis/gcm/engine/gcm_store_impl_unittest.cc ('k') | google_apis/gcm/engine/mcs_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: google_apis/gcm/engine/heartbeat_manager.cc
diff --git a/google_apis/gcm/engine/heartbeat_manager.cc b/google_apis/gcm/engine/heartbeat_manager.cc
index d7ec689a09d3c9003bb05a87c151efb3b6f025a0..8ac70b841b90f5a200f28b8a82fba47f674e4674 100644
--- a/google_apis/gcm/engine/heartbeat_manager.cc
+++ b/google_apis/gcm/engine/heartbeat_manager.cc
@@ -4,6 +4,8 @@
#include "google_apis/gcm/engine/heartbeat_manager.h"
+#include <utility>
+
#include "base/callback.h"
#include "base/location.h"
#include "base/metrics/histogram.h"
@@ -120,7 +122,7 @@ void HeartbeatManager::UpdateHeartbeatTimer(scoped_ptr<base::Timer> timer) {
base::Closure timer_task(heartbeat_timer_->user_task());
heartbeat_timer_->Stop();
- heartbeat_timer_ = timer.Pass();
+ heartbeat_timer_ = std::move(timer);
if (was_running)
heartbeat_timer_->Start(FROM_HERE, remaining_delay, timer_task);
« no previous file with comments | « google_apis/gcm/engine/gcm_store_impl_unittest.cc ('k') | google_apis/gcm/engine/mcs_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698