| 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 c7ccea1f66a0ec497b5972b81cdf73d2e74d3cf9..83b9977d5b121b46155e41f08aee8464b7778693 100644
|
| --- a/google_apis/gcm/engine/heartbeat_manager.cc
|
| +++ b/google_apis/gcm/engine/heartbeat_manager.cc
|
| @@ -122,7 +122,8 @@ base::TimeTicks HeartbeatManager::GetNextHeartbeatTime() const {
|
| return base::TimeTicks();
|
| }
|
|
|
| -void HeartbeatManager::UpdateHeartbeatTimer(scoped_ptr<base::Timer> timer) {
|
| +void HeartbeatManager::UpdateHeartbeatTimer(
|
| + std::unique_ptr<base::Timer> timer) {
|
| bool was_running = heartbeat_timer_->IsRunning();
|
| base::TimeDelta remaining_delay =
|
| heartbeat_timer_->desired_run_time() - base::TimeTicks::Now();
|
|
|