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

remoting/protocol/fake_authenticator.cc

 // Copyright (c) 2011 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/fake_authenticator.h"
 
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "net/socket/stream_socket.h"
 #include "remoting/base/constants.h"
@@ skipping 79 matching lines @@
 }
 
 void FakeAuthenticator::ProcessMessage(const buzz::XmlElement* message) {
   EXPECT_EQ(WAITING_MESSAGE, state());
   std::string id =
       message->TextNamed(buzz::QName(kChromotingXmlNamespace, "id"));
   EXPECT_EQ(id, base::IntToString(messages_));
   ++messages_;
 }
 
-buzz::XmlElement* FakeAuthenticator::GetNextMessage() {
+scoped_ptr<buzz::XmlElement> FakeAuthenticator::GetNextMessage() {
   EXPECT_EQ(MESSAGE_READY, state());
 
-  buzz::XmlElement* result = new buzz::XmlElement(
-      buzz::QName(kChromotingXmlNamespace, "authentication"));
+  scoped_ptr<buzz::XmlElement> result(new buzz::XmlElement(
+      buzz::QName(kChromotingXmlNamespace, "authentication")));
   buzz::XmlElement* id = new buzz::XmlElement(
       buzz::QName(kChromotingXmlNamespace, "id"));
   id->AddText(base::IntToString(messages_));
   result->AddElement(id);
 
   ++messages_;
-  return result;
+  return result.Pass();
 }
 
-ChannelAuthenticator*
+scoped_ptr<ChannelAuthenticator>
 FakeAuthenticator::CreateChannelAuthenticator() const {
   EXPECT_EQ(ACCEPTED, state());
-  return new FakeChannelAuthenticator(action_ != REJECT_CHANNEL, async_);
+  return scoped_ptr<ChannelAuthenticator>(
+      new FakeChannelAuthenticator(action_ != REJECT_CHANNEL, async_));
 }
 
 FakeHostAuthenticatorFactory::FakeHostAuthenticatorFactory(
     int round_trips, FakeAuthenticator::Action action, bool async)
     : round_trips_(round_trips),
       action_(action), async_(async) {
 }
 
 FakeHostAuthenticatorFactory::~FakeHostAuthenticatorFactory() {
 }
 
-Authenticator* FakeHostAuthenticatorFactory::CreateAuthenticator(
+scoped_ptr<Authenticator> FakeHostAuthenticatorFactory::CreateAuthenticator(
     const std::string& remote_jid,
     const buzz::XmlElement* first_message) {
-  return new FakeAuthenticator(FakeAuthenticator::HOST, round_trips_,
-                               action_, async_);
+  return scoped_ptr<Authenticator>(new FakeAuthenticator(
+      FakeAuthenticator::HOST, round_trips_, action_, async_));
 }
 
 }  // namespace protocol
 }  // namespace remoting