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

Unified Diff: google_apis/gcm/base/mcs_util.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/base/mcs_util.h
diff --git a/google_apis/gcm/base/mcs_util.h b/google_apis/gcm/base/mcs_util.h
index 53f53eac1aea4e010b9ed296e3d929d3661bfb06..e23c391a335655b014a9aff8c830c26095684856 100644
--- a/google_apis/gcm/base/mcs_util.h
+++ b/google_apis/gcm/base/mcs_util.h
@@ -9,11 +9,11 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include <vector>
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "google_apis/gcm/base/gcm_export.h"
#include "google_apis/gcm/protocol/mcs.pb.h"
@@ -56,18 +56,18 @@ enum MCSIqStanzaExtension {
};
// Builds a LoginRequest with the hardcoded local data.
-GCM_EXPORT scoped_ptr<mcs_proto::LoginRequest> BuildLoginRequest(
+GCM_EXPORT std::unique_ptr<mcs_proto::LoginRequest> BuildLoginRequest(
uint64_t auth_id,
uint64_t auth_token,
const std::string& version_string);
// Builds a StreamAck IqStanza message.
-GCM_EXPORT scoped_ptr<mcs_proto::IqStanza> BuildStreamAck();
-GCM_EXPORT scoped_ptr<mcs_proto::IqStanza> BuildSelectiveAck(
+GCM_EXPORT std::unique_ptr<mcs_proto::IqStanza> BuildStreamAck();
+GCM_EXPORT std::unique_ptr<mcs_proto::IqStanza> BuildSelectiveAck(
const std::vector<std::string>& acked_ids);
// Utility methods for building and identifying MCS protobufs.
-GCM_EXPORT scoped_ptr<google::protobuf::MessageLite> BuildProtobufFromTag(
+GCM_EXPORT std::unique_ptr<google::protobuf::MessageLite> BuildProtobufFromTag(
uint8_t tag);
GCM_EXPORT int GetMCSProtoTag(const google::protobuf::MessageLite& message);

Powered by Google App Engine
This is Rietveld 408576698