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

remoting/protocol/pepper_session_unittest.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.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "base/test/test_timeouts.h"
@@ skipping 160 matching lines @@
         EXPECT_CALL(client_connection_callback_,
                     OnStateChange(Session::AUTHENTICATED))
             .Times(1);
         // Expect that the connection will be closed eventually.
         EXPECT_CALL(client_connection_callback_,
                     OnStateChange(Session::CLOSED))
             .Times(AtMost(1));
       }
     }
 
-    Authenticator* authenticator = new FakeAuthenticator(
-        FakeAuthenticator::CLIENT, auth_round_trips, auth_action, true);
+    scoped_ptr<Authenticator> authenticator(new FakeAuthenticator(
+        FakeAuthenticator::CLIENT, auth_round_trips, auth_action, true));
 
-    client_session_.reset(client_server_->Connect(
-        kHostJid, authenticator,
+    client_session_ = client_server_->Connect(
+        kHostJid, authenticator.Pass(),
         CandidateSessionConfig::CreateDefault(),
         base::Bind(&MockSessionCallback::OnStateChange,
-                   base::Unretained(&client_connection_callback_))));
+                   base::Unretained(&client_connection_callback_)));
 
     message_loop_.RunAllPending();
   }
 
   JingleThreadMessageLoop message_loop_;
 
   scoped_ptr<FakeSignalStrategy> host_signal_strategy_;
   scoped_ptr<FakeSignalStrategy> client_signal_strategy_;
 
   scoped_ptr<JingleSessionManager> host_server_;
@@ skipping 27 matching lines @@
     InSequence dummy;
 
     EXPECT_CALL(client_connection_callback_,
                 OnStateChange(Session::CONNECTING))
         .Times(1);
     EXPECT_CALL(client_connection_callback_,
                 OnStateChange(Session::FAILED))
         .Times(1);
   }
 
-  Authenticator* authenticator = new FakeAuthenticator(
-      FakeAuthenticator::CLIENT, 1, FakeAuthenticator::ACCEPT, true);
-  client_session_.reset(client_server_->Connect(
-      kHostJid, authenticator,
-      CandidateSessionConfig::CreateDefault(),
+  scoped_ptr<Authenticator> authenticator(new FakeAuthenticator(
+      FakeAuthenticator::CLIENT, 1, FakeAuthenticator::ACCEPT, true));
+  client_session_ = client_server_->Connect(
+      kHostJid, authenticator.Pass(), CandidateSessionConfig::CreateDefault(),
       base::Bind(&MockSessionCallback::OnStateChange,
-                 base::Unretained(&client_connection_callback_))));
+                 base::Unretained(&client_connection_callback_)));
 
   message_loop_.RunAllPending();
 }
 
 // Verify that we can connect two endpoints with single-step authentication.
 TEST_F(PepperSessionTest, Connect) {
   CreateSessionManagers(1, FakeAuthenticator::ACCEPT);
   InitiateConnection(1, FakeAuthenticator::ACCEPT, false);
 }
 
@@ skipping 10 matching lines @@
 }
 
 // Verify that connection is terminated when multi-step auth fails.
 TEST_F(PepperSessionTest, ConnectWithBadMultistepAuth) {
   CreateSessionManagers(3, FakeAuthenticator::REJECT);
   InitiateConnection(3, FakeAuthenticator::ACCEPT, true);
 }
 
 }  // namespace protocol
 }  // namespace remoting