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

Unified Diff: google_apis/gcm/engine/gcm_store.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/gcm_store.h
diff --git a/google_apis/gcm/engine/gcm_store.h b/google_apis/gcm/engine/gcm_store.h
index 6395edfd14e3c2336e3aa907d840fc4e26ec5bd9..828658bbb3099d2be60946bed399d410cf380d02 100644
--- a/google_apis/gcm/engine/gcm_store.h
+++ b/google_apis/gcm/engine/gcm_store.h
@@ -5,19 +5,19 @@
#ifndef GOOGLE_APIS_GCM_ENGINE_GCM_STORE_H_
#define GOOGLE_APIS_GCM_ENGINE_GCM_STORE_H_
+#include <google/protobuf/message_lite.h>
+#include <stdint.h>
+
#include <map>
+#include <memory>
#include <set>
#include <string>
#include <vector>
-#include <google/protobuf/message_lite.h>
-#include <stdint.h>
-
#include "base/callback_forward.h"
#include "base/macros.h"
#include "base/memory/linked_ptr.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "google_apis/gcm/base/gcm_export.h"
#include "google_apis/gcm/engine/account_mapping.h"
@@ -67,7 +67,7 @@ class GCM_EXPORT GCMStore {
};
typedef std::vector<std::string> PersistentIdList;
- typedef base::Callback<void(scoped_ptr<LoadResult> result)> LoadCallback;
+ typedef base::Callback<void(std::unique_ptr<LoadResult> result)> LoadCallback;
typedef base::Callback<void(bool success)> UpdateCallback;
GCMStore();

Powered by Google App Engine
This is Rietveld 408576698