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

remoting/protocol/connection_to_host.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/connection_to_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
@@ skipping 106 matching lines @@
   } else if (state == SignalStrategy::DISCONNECTED) {
     VLOG(1) << "Connection closed.";
     CloseOnError(NETWORK_FAILURE);
   }
 }
 
 void ConnectionToHost::OnSessionManagerReady() {
   DCHECK(message_loop_->BelongsToCurrentThread());
 
   // After SessionManager is initialized we can try to connect to the host.
-  CandidateSessionConfig* candidate_config =
+  scoped_ptr<CandidateSessionConfig> candidate_config =
       CandidateSessionConfig::CreateDefault();
-  V1ClientAuthenticator* authenticator =
-      new V1ClientAuthenticator(signal_strategy_->GetLocalJid(), access_code_);
-  session_.reset(session_manager_->Connect(
-      host_jid_, authenticator, candidate_config,
+  scoped_ptr<Authenticator> authenticator(
+      new V1ClientAuthenticator(signal_strategy_->GetLocalJid(), access_code_));
+  session_ = session_manager_->Connect(
+      host_jid_, authenticator.Pass(), candidate_config.Pass(),
       base::Bind(&ConnectionToHost::OnSessionStateChange,
-                 base::Unretained(this))));
+                 base::Unretained(this)));
 }
 
 void ConnectionToHost::OnIncomingSession(
     Session* session,
     SessionManager::IncomingSessionResponse* response) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   // Client always rejects incoming sessions.
   *response = SessionManager::DECLINE;
 }
 
@@ skipping 95 matching lines @@
 
   if (state != state_) {
     state_ = state;
     error_ = error;
     event_callback_->OnConnectionState(state_, error_);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting