Use scoped_ptr<> to pass ownership in more places.

remoting/host/chromoting_host_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 "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop_proxy.h"
 #include "remoting/jingle_glue/mock_objects.h"
 #include "remoting/host/capturer_fake.h"
 #include "remoting/host/chromoting_host.h"
@@ skipping 86 matching lines @@
 
     host_ = new ChromotingHost(
         &context_, &signal_strategy_, desktop_environment_.get(),
         protocol::NetworkSettings());
 
     disconnect_window_ = new MockDisconnectWindow();
     continue_window_ = new MockContinueWindow();
     local_input_monitor_ = new MockLocalInputMonitor();
     it2me_host_user_interface_.reset(new It2MeHostUserInterface(host_,
                                                                 &context_));
-    it2me_host_user_interface_->InitFrom(disconnect_window_, continue_window_,
-                                         local_input_monitor_);
+    it2me_host_user_interface_->InitFrom(
+        scoped_ptr<DisconnectWindow>(disconnect_window_),
+        scoped_ptr<ContinueWindow>(continue_window_),
+        scoped_ptr<LocalInputMonitor>(local_input_monitor_));
 
     session_ = new MockSession();
     session2_ = new MockSession();
     session_config_ = SessionConfig::GetDefault();
     session_jid_ = "user@domain/rest-of-jid";
     session_config2_ = SessionConfig::GetDefault();
     session2_jid_ = "user2@domain/rest-of-jid";
     EXPECT_CALL(*session_, jid())
         .WillRepeatedly(ReturnRef(session_jid_));
     EXPECT_CALL(*session2_, jid())
@@ skipping 52 matching lines @@
     owned_connection_.reset();
     owned_connection2_.reset();
     host_ = NULL;
     // Run message loop before destroying because protocol::Session is
     // destroyed asynchronously.
     message_loop_.RunAllPending();
   }
 
   // Helper method to pretend a client is connected to ChromotingHost.
   void SimulateClientConnection(int connection_index, bool authenticate) {
-    protocol::ConnectionToClient* connection = (connection_index == 0) ?
-        owned_connection_.release() : owned_connection2_.release();
+    scoped_ptr<protocol::ConnectionToClient> connection =
+        ((connection_index == 0) ? owned_connection_ : owned_connection2_).
+        PassAs<protocol::ConnectionToClient>();
     ClientSession* client = new ClientSession(
-        host_.get(), connection, event_executor_,
+        host_.get(), connection.Pass(), event_executor_,
         desktop_environment_->capturer());
     connection->set_host_stub(client);
 
     context_.network_message_loop()->PostTask(
         FROM_HERE, base::Bind(&ChromotingHostTest::AddClientToHost,
                               host_, client));
     if (authenticate) {
       context_.network_message_loop()->PostTask(
           FROM_HERE, base::Bind(&ClientSession::OnConnectionOpened,
-                                base::Unretained(client), connection));
+                                base::Unretained(client), connection.get()));

[Alpha Left Google, 2012/03/20 18:56:40]

Isn't this connection.get() will be NULL since connection.Pass() above?

[Sergey Ulanov, 2012/03/20 19:08:12]

Done.

     }
 
     if (connection_index == 0) {
       client_ = client;
     } else {
       client2_ = client;
     }
   }
 
   // Helper method to remove a client connection from ChromotingHost.
@@ skipping 164 matching lines @@
   EXPECT_CALL(*connection_, Disconnect())
       .RetiresOnSaturation();
   EXPECT_CALL(*connection2_, Disconnect())
       .RetiresOnSaturation();
 
   SimulateClientConnection(0, true);
   message_loop_.Run();
 }
 
 }  // namespace remoting