Use std::move() instead of scoped_ptr<>::Pass().

remoting/protocol/jingle_messages.cc

 // Copyright (c) 2012 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 "remoting/protocol/jingle_messages.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/content_description.h"
@@ skipping 288 matching lines @@
   jingle_tag->AddAttr(QName(kEmptyNamespace, "sid"), sid);
 
   const char* action_attr = ValueToName(kActionTypes, action);
   if (!action_attr)
     LOG(FATAL) << "Invalid action value " << action;
   jingle_tag->AddAttr(QName(kEmptyNamespace, "action"), action_attr);
 
   if (action == SESSION_INFO) {
     if (info.get())
       jingle_tag->AddElement(new XmlElement(*info.get()));
-    return root.Pass();
+    return root;
   }
 
   if (action == SESSION_INITIATE)
     jingle_tag->AddAttr(QName(kEmptyNamespace, "initiator"), initiator);
 
   if (reason != UNKNOWN_REASON) {
     XmlElement* reason_tag = new XmlElement(QName(kJingleNamespace, "reason"));
     jingle_tag->AddElement(reason_tag);
     const char* reason_string =
         ValueToName(kReasons, reason);
@@ skipping 12 matching lines @@
                          ContentDescription::kChromotingContentName);
     content_tag->AddAttr(QName(kEmptyNamespace, "creator"), "initiator");
 
     if (description.get())
       content_tag->AddElement(description->ToXml());
 
     if (transport_info)
       content_tag->AddElement(new XmlElement(*transport_info));
   }
 
-  return root.Pass();
+  return root;
 }
 
 JingleMessageReply::JingleMessageReply()
     : type(REPLY_RESULT),
       error_type(NONE) {
 }
 
 JingleMessageReply::JingleMessageReply(ErrorType error)
     : type(error != NONE ? REPLY_ERROR : REPLY_RESULT),
       error_type(error) {
@@ skipping 12 matching lines @@
     const buzz::XmlElement* request_stanza) const {
   scoped_ptr<XmlElement> iq(
       new XmlElement(QName(kJabberNamespace, "iq"), true));
   iq->SetAttr(QName(kEmptyNamespace, "to"),
               request_stanza->Attr(QName(kEmptyNamespace, "from")));
   iq->SetAttr(QName(kEmptyNamespace, "id"),
               request_stanza->Attr(QName(kEmptyNamespace, "id")));
 
   if (type == REPLY_RESULT) {
     iq->SetAttr(QName(kEmptyNamespace, "type"), "result");
-    return iq.Pass();
+    return iq;
   }
 
   DCHECK_EQ(type, REPLY_ERROR);
 
   iq->SetAttr(QName(kEmptyNamespace, "type"), "error");
 
   for (const buzz::XmlElement* child = request_stanza->FirstElement();
        child != nullptr; child = child->NextElement()) {
     iq->AddElement(new buzz::XmlElement(*child));
   }
@@ skipping 47 matching lines @@
   if (!error_text.empty()) {
     // It's okay to always use English here. This text is for
     // debugging purposes only.
     buzz::XmlElement* text_elem =
             new buzz::XmlElement(QName(kJabberNamespace, "text"));
     text_elem->SetAttr(QName(kXmlNamespace, "lang"), "en");
     text_elem->SetBodyText(error_text);
     error->AddElement(text_elem);
   }
 
-  return iq.Pass();
+  return iq;
 }
 
 IceTransportInfo::IceTransportInfo() {}
 IceTransportInfo::~IceTransportInfo() {}
 
 bool IceTransportInfo::ParseXml(
     const buzz::XmlElement* element) {
   if (element->Name() != QName(kIceTransportNamespace, "transport"))
     return false;
 
@@ skipping 24 matching lines @@
 
 scoped_ptr<buzz::XmlElement> IceTransportInfo::ToXml() const {
   scoped_ptr<buzz::XmlElement> result(
       new XmlElement(QName(kIceTransportNamespace, "transport"), true));
   for (const IceCredentials& credentials : ice_credentials) {
     result->AddElement(FormatIceCredentials(credentials));
   }
   for (const NamedCandidate& candidate : candidates) {
     result->AddElement(FormatIceCandidate(candidate));
   }
-  return result.Pass();
+  return result;
 }
 
 }  // namespace protocol
 }  // namespace remoting