Make ConnectionToClient and ClientSession not ref-counted.

remoting/protocol/connection_to_client_unittest.cc

 // Copyright (c) 2011 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/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "remoting/base/base_mock_objects.h"
 #include "remoting/base/constants.h"
 #include "remoting/protocol/fake_session.h"
 #include "remoting/protocol/connection_to_client.h"
 #include "remoting/protocol/protocol_mock_objects.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using ::testing::_;
 using ::testing::NotNull;
 using ::testing::StrictMock;
 
 namespace remoting {
 namespace protocol {
 
 class ConnectionToClientTest : public testing::Test {
  public:
   ConnectionToClientTest() {
   }
 
  protected:
-  virtual void SetUp() {
+  virtual void SetUp() OVERRIDE {
     session_ = new protocol::FakeSession();
     session_->set_message_loop(&message_loop_);
 
     // Allocate a ClientConnection object with the mock objects.
-    viewer_ = new ConnectionToClient(
-        base::MessageLoopProxy::current(), session_);
+    viewer_.reset(new ConnectionToClient(session_));
     viewer_->set_host_stub(&host_stub_);
     viewer_->set_input_stub(&input_stub_);
     viewer_->SetEventHandler(&handler_);
     EXPECT_CALL(handler_, OnConnectionOpened(viewer_.get()));
     session_->state_change_callback().Run(
         protocol::Session::CONNECTED);
     session_->state_change_callback().Run(
         protocol::Session::CONNECTED_CHANNELS);
     message_loop_.RunAllPending();
   }
 
   virtual void TearDown() OVERRIDE {
-    viewer_ = NULL;
+    viewer_.reset();
     message_loop_.RunAllPending();
   }
 
   MessageLoop message_loop_;
   MockConnectionToClientEventHandler handler_;
   MockHostStub host_stub_;
   MockInputStub input_stub_;
-  scoped_refptr<ConnectionToClient> viewer_;
+  scoped_ptr<ConnectionToClient> viewer_;
 
   // Owned by |viewer_|.
   protocol::FakeSession* session_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ConnectionToClientTest);
 };
 
 TEST_F(ConnectionToClientTest, SendUpdateStream) {
   // Then send the actual data.
@@ skipping 35 matching lines @@
   session_->state_change_callback().Run(protocol::Session::CLOSED);
   message_loop_.RunAllPending();
 
   EXPECT_CALL(handler_, OnConnectionFailed(viewer_.get()));
   session_->state_change_callback().Run(protocol::Session::FAILED);
   message_loop_.RunAllPending();
 }
 
 }  // namespace protocol
 }  // namespace remoting