Use scoped_ptr<>.Pass() to pass ownership in the remoting protocol code.

remoting/protocol/v1_authenticator.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/v1_authenticator.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "crypto/rsa_private_key.h"
 #include "remoting/base/constants.h"
@@ skipping 41 matching lines @@
     }
   }
 
   if (remote_cert_.empty()) {
     state_ = REJECTED;
   } else {
     state_ = ACCEPTED;
   }
 }
 
-XmlElement* V1ClientAuthenticator::GetNextMessage() {
+scoped_ptr<XmlElement> V1ClientAuthenticator::GetNextMessage() {
   DCHECK_EQ(state_, MESSAGE_READY);
 
-  XmlElement* message = CreateEmptyAuthenticatorMessage();
+  scoped_ptr<XmlElement> message = CreateEmptyAuthenticatorMessage();
   std::string token =
       protocol::GenerateSupportAuthToken(local_jid_, shared_secret_);
   XmlElement* auth_token_tag = new XmlElement(
       QName(kChromotingXmlNamespace, kAuthTokenTag));
   auth_token_tag->SetBodyText(token);
   message->AddElement(auth_token_tag);
 
   state_ = WAITING_MESSAGE;
-  return message;
+  return message.Pass();
 }
 
-ChannelAuthenticator*
+scoped_ptr<ChannelAuthenticator>
 V1ClientAuthenticator::CreateChannelAuthenticator() const {
   DCHECK_EQ(state_, ACCEPTED);
-  SslHmacChannelAuthenticator* result =
+  scoped_ptr<SslHmacChannelAuthenticator> result =
       SslHmacChannelAuthenticator::CreateForClient(
           remote_cert_, shared_secret_);
   result->SetLegacyOneWayMode(SslHmacChannelAuthenticator::SEND_ONLY);
-  return result;
+  return scoped_ptr<ChannelAuthenticator>(result.release());

[Wez, 2012/01/19 03:18:17]

result.Pass()?

[Sergey Ulanov, 2012/01/19 20:11:42]

We need to upcast the pointer, and Pass() doesn't do the right thing here.
Changed it to scoped_ptr<ChannelAuthenticator>(result.Pass()) - but it's
essentially the same as with .release()

[Wez, 2012/01/19 23:23:41]

True, but if you didn't have to do the up-cast then you'd just Pass(), so I
think Pass() is more "correct".

Plus, it's three fewer characters. ;)

[Sergey Ulanov, 2012/01/19 23:50:26]

I agree

 };
 
 V1HostAuthenticator::V1HostAuthenticator(
     const std::string& local_cert,
     const crypto::RSAPrivateKey& local_private_key,
     const std::string& shared_secret,
     const std::string& remote_jid)
     : local_cert_(local_cert),
       local_private_key_(local_private_key.Copy()),
       shared_secret_(shared_secret),
@@ skipping 15 matching lines @@
       message->TextNamed(buzz::QName(kChromotingXmlNamespace, kAuthTokenTag));
 
   if (!protocol::VerifySupportAuthToken(
           remote_jid_, shared_secret_, auth_token)) {
     state_ = REJECTED;
   } else {
     state_ = MESSAGE_READY;
   }
 }
 
-XmlElement* V1HostAuthenticator::GetNextMessage() {
+scoped_ptr<XmlElement> V1HostAuthenticator::GetNextMessage() {
   DCHECK_EQ(state_, MESSAGE_READY);
 
-  XmlElement* message = CreateEmptyAuthenticatorMessage();
+  scoped_ptr<XmlElement> message = CreateEmptyAuthenticatorMessage();
   buzz::XmlElement* certificate_tag = new XmlElement(
       buzz::QName(kChromotingXmlNamespace, kCertificateTag));
   std::string base64_cert;
   if (!base::Base64Encode(local_cert_, &base64_cert)) {
     LOG(DFATAL) << "Cannot perform base64 encode on certificate";
   }
   certificate_tag->SetBodyText(base64_cert);
   message->AddElement(certificate_tag);
 
   state_ = ACCEPTED;
-  return message;
+  return message.Pass();
 }
 
-ChannelAuthenticator*
+scoped_ptr<ChannelAuthenticator>
 V1HostAuthenticator::CreateChannelAuthenticator() const {
   DCHECK_EQ(state_, ACCEPTED);
-  SslHmacChannelAuthenticator* result =
+  scoped_ptr<SslHmacChannelAuthenticator> result =
       SslHmacChannelAuthenticator::CreateForHost(
           local_cert_, local_private_key_.get(), shared_secret_);
   result->SetLegacyOneWayMode(SslHmacChannelAuthenticator::RECEIVE_ONLY);
-  return result;
+  return scoped_ptr<ChannelAuthenticator>(result.release());

[Wez, 2012/01/19 03:18:17]

Ditto.

[Sergey Ulanov, 2012/01/19 20:11:42]

same here.

 };
 
 }  // namespace remoting
 }  // namespace protocol