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

remoting/protocol/jingle_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/jingle_session_manager.h"
 
 #include <limits>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 104 matching lines @@
 }
 
 void JingleSessionManager::set_authenticator_factory(
     scoped_ptr<AuthenticatorFactory> authenticator_factory) {
   DCHECK(CalledOnValidThread());
   DCHECK(authenticator_factory.get());
   DCHECK(!authenticator_factory_.get());
   authenticator_factory_ = authenticator_factory.Pass();
 }
 
-Session* JingleSessionManager::Connect(
+scoped_ptr<Session> JingleSessionManager::Connect(
     const std::string& host_jid,
-    Authenticator* authenticator,
-    CandidateSessionConfig* candidate_config,
+    scoped_ptr<Authenticator> authenticator,
+    scoped_ptr<CandidateSessionConfig> config,
     const Session::StateChangeCallback& state_change_callback) {
   DCHECK(CalledOnValidThread());
 
   cricket::Session* cricket_session = cricket_session_manager_->CreateSession(
       signal_strategy_->GetLocalJid(), kChromotingXmlNamespace);
   cricket_session->set_remote_name(host_jid);
 
-  JingleSession* jingle_session =
-      new JingleSession(this, cricket_session, authenticator);
-  jingle_session->set_candidate_config(candidate_config);
+  scoped_ptr<JingleSession> jingle_session(
+      new JingleSession(this, cricket_session, authenticator.Pass()));
+  jingle_session->set_candidate_config(config.Pass());
   jingle_session->SetStateChangeCallback(state_change_callback);
-  sessions_.push_back(jingle_session);
+  sessions_.push_back(jingle_session.get());
 
   jingle_session->SendSessionInitiate();
 
-  return jingle_session;
+  return scoped_ptr<Session>(jingle_session.Pass());

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

This doesn't seem too painful; at least it works!

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

Yeah, I'm also considering adding PassAs<>(), with it this code would look like
this:
 return jingle_session.PassAs<Session>();

[Wez, 2012/01/19 23:56:57]

That's a good idea. :)

 }
 
 void JingleSessionManager::OnSessionCreate(
     cricket::Session* cricket_session, bool incoming) {
   DCHECK(CalledOnValidThread());
 
   // Allow local connections.
   cricket_session->set_allow_local_ips(true);
 
   if (incoming) {
     JingleSession* jingle_session =
-        new JingleSession(this, cricket_session, NULL);
+        new JingleSession(this, cricket_session, scoped_ptr<Authenticator>());
     sessions_.push_back(jingle_session);
   }
 }
 
 void JingleSessionManager::OnSessionDestroy(cricket::Session* cricket_session) {
   DCHECK(CalledOnValidThread());
 
   std::list<JingleSession*>::iterator it;
   for (it = sessions_.begin(); it != sessions_.end(); ++it) {
     if ((*it)->HasSession(cricket_session)) {
@@ skipping 24 matching lines @@
 
   // Reject connection if we are closed.
   if (closed_)
     return SessionManager::DECLINE;
 
   IncomingSessionResponse response = SessionManager::DECLINE;
   listener_->OnIncomingSession(jingle_session, &response);
   return response;
 }
 
-Authenticator* JingleSessionManager::CreateAuthenticator(
+scoped_ptr<Authenticator> JingleSessionManager::CreateAuthenticator(
     const std::string& jid, const buzz::XmlElement* auth_message) {
   DCHECK(CalledOnValidThread());
 
   if (!authenticator_factory_.get())
-    return NULL;
+    return scoped_ptr<Authenticator>(NULL);
   return authenticator_factory_->CreateAuthenticator(jid, auth_message);
 }
 
 void JingleSessionManager::SessionDestroyed(JingleSession* jingle_session) {
   std::list<JingleSession*>::iterator it =
       std::find(sessions_.begin(), sessions_.end(), jingle_session);
   CHECK(it != sessions_.end());
   cricket::Session* cricket_session = jingle_session->ReleaseSession();
   cricket_session_manager_->DestroySession(cricket_session);
   sessions_.erase(it);
@@ skipping 44 matching lines @@
     cricket::WriteError* error) {
   const ContentDescription* desc =
       static_cast<const ContentDescription*>(content);
 
   *elem = desc->ToXml();
   return true;
 }
 
 }  // namespace protocol
 }  // namespace remoting