| 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);
|
|
|