Convert //google_apis from scoped_ptr to std::unique_ptr

google_apis/gcm/base/mcs_util.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "google_apis/gcm/base/mcs_util.h"
 
 #include <stddef.h>
 
 #include "base/format_macros.h"
 #include "base/logging.h"
@@ skipping 35 matching lines @@
 const char kLoginDomain[] = "mcs.android.com";
 const char kLoginDeviceIdPrefix[] = "android-";
 const char kLoginSettingDefaultName[] = "new_vc";
 const char kLoginSettingDefaultValue[] = "1";
 
 // Maximum amount of time to save an unsent outgoing message for.
 const int kMaxTTLSeconds = 24 * 60 * 60;  // 1 day.
 
 }  // namespace
 
-scoped_ptr<mcs_proto::LoginRequest> BuildLoginRequest(
+std::unique_ptr<mcs_proto::LoginRequest> BuildLoginRequest(
     uint64_t auth_id,
     uint64_t auth_token,
     const std::string& version_string) {
   // Create a hex encoded auth id for the device id field.
   std::string auth_id_hex;
   auth_id_hex = base::StringPrintf("%" PRIx64, auth_id);
 
   std::string auth_id_str = base::Uint64ToString(auth_id);
   std::string auth_token_str = base::Uint64ToString(auth_token);
 
-  scoped_ptr<mcs_proto::LoginRequest> login_request(
+  std::unique_ptr<mcs_proto::LoginRequest> login_request(
       new mcs_proto::LoginRequest());
 
   login_request->set_adaptive_heartbeat(false);
   login_request->set_auth_service(mcs_proto::LoginRequest::ANDROID_ID);
   login_request->set_auth_token(auth_token_str);
   login_request->set_id(kLoginId + version_string);
   login_request->set_domain(kLoginDomain);
   login_request->set_device_id(kLoginDeviceIdPrefix + auth_id_hex);
   login_request->set_network_type(1);
   login_request->set_resource(auth_id_str);
   login_request->set_user(auth_id_str);
   login_request->set_use_rmq2(true);
 
   login_request->add_setting();
   login_request->mutable_setting(0)->set_name(kLoginSettingDefaultName);
   login_request->mutable_setting(0)->set_value(kLoginSettingDefaultValue);
   return login_request;
 }
 
-scoped_ptr<mcs_proto::IqStanza> BuildStreamAck() {
-  scoped_ptr<mcs_proto::IqStanza> stream_ack_iq(new mcs_proto::IqStanza());
+std::unique_ptr<mcs_proto::IqStanza> BuildStreamAck() {
+  std::unique_ptr<mcs_proto::IqStanza> stream_ack_iq(new mcs_proto::IqStanza());
   stream_ack_iq->set_type(mcs_proto::IqStanza::SET);
   stream_ack_iq->set_id("");
   stream_ack_iq->mutable_extension()->set_id(kStreamAck);
   stream_ack_iq->mutable_extension()->set_data("");
   return stream_ack_iq;
 }
 
-scoped_ptr<mcs_proto::IqStanza> BuildSelectiveAck(
+std::unique_ptr<mcs_proto::IqStanza> BuildSelectiveAck(
     const std::vector<std::string>& acked_ids) {
-  scoped_ptr<mcs_proto::IqStanza> selective_ack_iq(new mcs_proto::IqStanza());
+  std::unique_ptr<mcs_proto::IqStanza> selective_ack_iq(
+      new mcs_proto::IqStanza());
   selective_ack_iq->set_type(mcs_proto::IqStanza::SET);
   selective_ack_iq->set_id("");
   selective_ack_iq->mutable_extension()->set_id(kSelectiveAck);
   mcs_proto::SelectiveAck selective_ack;
   for (size_t i = 0; i < acked_ids.size(); ++i)
     selective_ack.add_id(acked_ids[i]);
   selective_ack_iq->mutable_extension()->set_data(
       selective_ack.SerializeAsString());
   return selective_ack_iq;
 }
 
 // Utility method to build a google::protobuf::MessageLite object from a MCS
 // tag.
-scoped_ptr<google::protobuf::MessageLite> BuildProtobufFromTag(uint8_t tag) {
+std::unique_ptr<google::protobuf::MessageLite> BuildProtobufFromTag(
+    uint8_t tag) {
   switch(tag) {
     case kHeartbeatPingTag:
-      return scoped_ptr<google::protobuf::MessageLite>(
+      return std::unique_ptr<google::protobuf::MessageLite>(
           new mcs_proto::HeartbeatPing());
     case kHeartbeatAckTag:
-      return scoped_ptr<google::protobuf::MessageLite>(
+      return std::unique_ptr<google::protobuf::MessageLite>(
           new mcs_proto::HeartbeatAck());
     case kLoginRequestTag:
-      return scoped_ptr<google::protobuf::MessageLite>(
+      return std::unique_ptr<google::protobuf::MessageLite>(
           new mcs_proto::LoginRequest());
     case kLoginResponseTag:
-      return scoped_ptr<google::protobuf::MessageLite>(
+      return std::unique_ptr<google::protobuf::MessageLite>(
           new mcs_proto::LoginResponse());
     case kCloseTag:
-      return scoped_ptr<google::protobuf::MessageLite>(
+      return std::unique_ptr<google::protobuf::MessageLite>(
           new mcs_proto::Close());
     case kIqStanzaTag:
-      return scoped_ptr<google::protobuf::MessageLite>(
+      return std::unique_ptr<google::protobuf::MessageLite>(
           new mcs_proto::IqStanza());
     case kDataMessageStanzaTag:
-      return scoped_ptr<google::protobuf::MessageLite>(
+      return std::unique_ptr<google::protobuf::MessageLite>(
           new mcs_proto::DataMessageStanza());
     case kStreamErrorStanzaTag:
-      return scoped_ptr<google::protobuf::MessageLite>(
+      return std::unique_ptr<google::protobuf::MessageLite>(
           new mcs_proto::StreamErrorStanza());
     default:
-      return scoped_ptr<google::protobuf::MessageLite>();
+      return std::unique_ptr<google::protobuf::MessageLite>();
   }
 }
 
 // Utility method to extract a MCS tag from a google::protobuf::MessageLite
 // object.
 int GetMCSProtoTag(const google::protobuf::MessageLite& message) {
   const std::string& type_name = message.GetTypeName();
   if (type_name == kProtoNames[kHeartbeatPingTag]) {
     return kHeartbeatPingTag;
   } else if (type_name == kProtoNames[kHeartbeatAckTag]) {
@@ skipping 115 matching lines @@
 
 bool IsImmediateAckRequested(const google::protobuf::MessageLite& protobuf) {
   if (protobuf.GetTypeName() != kProtoNames[kDataMessageStanzaTag])
     return false;
   const mcs_proto::DataMessageStanza* data_message =
       reinterpret_cast<const mcs_proto::DataMessageStanza*>(&protobuf);
   return data_message->has_immediate_ack() && data_message->immediate_ack();
 }
 
 }  // namespace gcm