Convert Pass()→std::move() in //google_apis

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 63 matching lines @@
   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.Pass();
+  return login_request;
 }
 
 scoped_ptr<mcs_proto::IqStanza> BuildStreamAck() {
   scoped_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.Pass();
+  return stream_ack_iq;
 }
 
 scoped_ptr<mcs_proto::IqStanza> BuildSelectiveAck(
     const std::vector<std::string>& acked_ids) {
   scoped_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.Pass();
+  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) {
   switch(tag) {
     case kHeartbeatPingTag:
       return scoped_ptr<google::protobuf::MessageLite>(
           new mcs_proto::HeartbeatPing());
     case kHeartbeatAckTag:
@@ skipping 147 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