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

remoting/protocol/pepper_session_manager.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/pepper_session_manager.h"
 
 #include "base/bind.h"
 #include "remoting/jingle_glue/iq_sender.h"
 #include "remoting/jingle_glue/jingle_info_request.h"
 #include "remoting/jingle_glue/signal_strategy.h"
@@ skipping 52 matching lines @@
   VLOG(1) << "STUN server: " << transport_config_.stun_server
           << " Relay server: " << transport_config_.relay_server
           << " Relay token: " << transport_config_.relay_token;
 
   if (!ready_) {
     ready_ = true;
     listener_->OnSessionManagerReady();
   }
 }
 
-Session* PepperSessionManager::Connect(
+scoped_ptr<Session> PepperSessionManager::Connect(
     const std::string& host_jid,
-    Authenticator* authenticator,
-    CandidateSessionConfig* config,
+    scoped_ptr<Authenticator> authenticator,
+    scoped_ptr<CandidateSessionConfig> config,
     const Session::StateChangeCallback& state_change_callback) {
   PepperSession* session = new PepperSession(this);

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

Make this the scoped_ptr<>, and return Pass()?

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

Done.

-  session->StartConnection(host_jid, authenticator, config,
+  session->StartConnection(host_jid, authenticator.Pass(), config.Pass(),
                            state_change_callback);
   sessions_[session->session_id_] = session;
-  return session;
+  return scoped_ptr<Session>(session);
 }
 
 void PepperSessionManager::Close() {
   DCHECK(CalledOnValidThread());
 
   // Close() can be called only after all sessions are destroyed.
   DCHECK(sessions_.empty());
 
   listener_ = NULL;
   jingle_info_request_.reset();
@@ skipping 61 matching lines @@
   buzz::XmlElement* stanza = reply.ToXml(original_stanza);
   signal_strategy_->SendStanza(stanza);
 }
 
 void PepperSessionManager::SessionDestroyed(PepperSession* session) {
   sessions_.erase(session->session_id_);
 }
 
 }  // namespace protocol
 }  // namespace remoting