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

remoting/protocol/jingle_session_manager.h

 // 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.
 
 #ifndef REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_
 #define REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_
 
 #include <list>
 #include <string>
 
@@ skipping 26 matching lines @@
                              public SignalStrategy::Listener {
  public:
   virtual ~JingleSessionManager();
 
   JingleSessionManager(base::MessageLoopProxy* message_loop);
 
   // SessionManager interface.
   virtual void Init(SignalStrategy* signal_strategy,
                     SessionManager::Listener* listener,
                     const NetworkSettings& network_settings) OVERRIDE;
-  virtual Session* Connect(
+  virtual scoped_ptr<Session> Connect(
       const std::string& host_jid,
-      Authenticator* authenticator,
-      CandidateSessionConfig* config,
+      scoped_ptr<Authenticator> authenticator,
+      scoped_ptr<CandidateSessionConfig> config,
       const Session::StateChangeCallback& state_change_callback) OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual void set_authenticator_factory(
       scoped_ptr<AuthenticatorFactory> authenticator_factory) OVERRIDE;
 
   // cricket::SessionClient interface.
   virtual void OnSessionCreate(cricket::Session* cricket_session,
                                bool received_initiate) OVERRIDE;
   virtual void OnSessionDestroy(cricket::Session* cricket_session) OVERRIDE;
 
@@ skipping 12 matching lines @@
 
  private:
   friend class JingleSession;
 
   // Called by JingleSession when a new connection is initiated.
   SessionManager::IncomingSessionResponse AcceptConnection(
       JingleSession* jingle_session);
 
   // Creates authenticator for incoming session. Returns NULL if
   // authenticator cannot be created, e.g. if |auth_message| is
-  // invalid. Caller reatins ownership of |auth_message| and must
-  // accept ownership of the result.
-  Authenticator* CreateAuthenticator(const std::string& jid,
-                                     const buzz::XmlElement* auth_message);
+  // invalid.
+  scoped_ptr<Authenticator> CreateAuthenticator(
+      const std::string& jid,
+      const buzz::XmlElement* auth_message);
 
   // Called by JingleSession when it is being destroyed.
   void SessionDestroyed(JingleSession* jingle_session);
 
   // Callback for JingleInfoRequest.
   void OnJingleInfo(
       const std::string& token,
       const std::vector<std::string>& relay_hosts,
       const std::vector<talk_base::SocketAddress>& stun_hosts);
 
@@ skipping 19 matching lines @@
 
   std::list<JingleSession*> sessions_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleSessionManager);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_