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

remoting/protocol/authenticator.h

 // 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.
 
 #ifndef REMOTING_PROTOCOL_AUTHENTICATOR_H_
 #define REMOTING_PROTOCOL_AUTHENTICATOR_H_
 
 #include <string>
 
+#include "base/memory/scoped_ptr.h"
+
 namespace buzz {
 class XmlElement;
 }  // namespace buzz
 
 namespace remoting {
 namespace protocol {
 
 class ChannelAuthenticator;
 
 // Authenticator is an abstract interface for authentication protocol
@@ skipping 30 matching lines @@
     ACCEPTED,
 
     // Session is rejected.
     REJECTED,
   };
 
   // Returns true if |message| is an Authenticator message.
   static bool IsAuthenticatorMessage(const buzz::XmlElement* message);
 
   // Creates an empty Authenticator message, owned by the caller.
-  static buzz::XmlElement* CreateEmptyAuthenticatorMessage();
+  static scoped_ptr<buzz::XmlElement> CreateEmptyAuthenticatorMessage();
 
   // Finds Authenticator message among child elements of |message|, or
   // returns NULL otherwise.
   static const buzz::XmlElement* FindAuthenticatorMessage(
       const buzz::XmlElement* message);
 
   Authenticator() {}
   virtual ~Authenticator() {}
 
   // Returns current state of the authenticator.
   virtual State state() const = 0;
 
   // Called in response to incoming message received from the peer.
   // Should only be called when in WAITING_MESSAGE state. Caller
   // retains ownership of |message|.
   virtual void ProcessMessage(const buzz::XmlElement* message) = 0;
 
   // Must be called when in MESSAGE_READY state. Returns next
   // authentication message that needs to be sent to the peer.
-  virtual buzz::XmlElement* GetNextMessage() = 0;
+  virtual scoped_ptr<buzz::XmlElement> GetNextMessage() = 0;
 
-  // Creates new authenticator for a channel. Caller must take
-  // ownership of the result. Can be called only in the ACCEPTED
-  // state.
-  virtual ChannelAuthenticator* CreateChannelAuthenticator() const = 0;
+  // Creates new authenticator for a channel. Can be called only in
+  // the ACCEPTED state.
+  virtual scoped_ptr<ChannelAuthenticator>
+      CreateChannelAuthenticator() const = 0;
 };
 
 // Factory for Authenticator instances.
 class AuthenticatorFactory {
  public:
   AuthenticatorFactory() {}
   virtual ~AuthenticatorFactory() {}
 
   // Called when session-initiate stanza is received to create
   // authenticator for the new session. |first_message| specifies
   // authentication part of the session-initiate stanza so that
   // appropriate type of Authenticator can be chosen for the session
   // (useful when multiple authenticators is supported). Returns NULL
   // if the |first_message| is invalid and the session should be
   // rejected. ProcessMessage() should be called with |first_message|
   // for the result of this method.
-  virtual Authenticator* CreateAuthenticator(
+  virtual scoped_ptr<Authenticator> CreateAuthenticator(
       const std::string& remote_jid,
       const buzz::XmlElement* first_message) = 0;
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_AUTHENTICATOR_H_