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

Unified Diff: google_apis/gcm/engine/heartbeat_manager.h

Issue 1873663002: Convert //google_apis from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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: google_apis/gcm/engine/heartbeat_manager.h
diff --git a/google_apis/gcm/engine/heartbeat_manager.h b/google_apis/gcm/engine/heartbeat_manager.h
index b8efe0374c0e2bfa0b350fcb9d0264fef8b76f1d..69ef9e5702cda9a0f88741f849d3cfd07a130eda 100644
--- a/google_apis/gcm/engine/heartbeat_manager.h
+++ b/google_apis/gcm/engine/heartbeat_manager.h
@@ -5,10 +5,11 @@
#ifndef GOOGLE_APIS_GCM_ENGINE_HEARTBEAT_MANAGER_H_
#define GOOGLE_APIS_GCM_ENGINE_HEARTBEAT_MANAGER_H_
+#include <memory>
+
#include "base/callback.h"
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/power_monitor/power_observer.h"
#include "google_apis/gcm/base/gcm_export.h"
@@ -59,7 +60,7 @@ class GCM_EXPORT HeartbeatManager : public base::PowerObserver {
base::TimeTicks GetNextHeartbeatTime() const;
// Updates the timer used for scheduling heartbeats.
- void UpdateHeartbeatTimer(scoped_ptr<base::Timer> timer);
+ void UpdateHeartbeatTimer(std::unique_ptr<base::Timer> timer);
// base::PowerObserver override.
void OnSuspend() override;
@@ -117,7 +118,7 @@ class GCM_EXPORT HeartbeatManager : public base::PowerObserver {
int client_interval_ms_;
// Timer for triggering heartbeats.
- scoped_ptr<base::Timer> heartbeat_timer_;
+ std::unique_ptr<base::Timer> heartbeat_timer_;
// Time at which the machine was last suspended.
base::Time suspend_time_;

Powered by Google App Engine
This is Rietveld 408576698