Move ConnectionToClient::EventHandler from ChromotingHost to ClientSession

remoting/host/client_session_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 "remoting/host/client_session.h"
 #include "remoting/host/host_mock_objects.h"
 #include "remoting/protocol/protocol_mock_objects.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
 
 using protocol::MockConnectionToClient;
 using protocol::MockConnectionToClientEventHandler;
 using protocol::MockHostStub;
 using protocol::MockInputStub;
 using protocol::MockSession;
 
 using testing::_;
 using testing::DeleteArg;
 using testing::InSequence;
 using testing::Return;
 using testing::ReturnRef;
 
 class ClientSessionTest : public testing::Test {
  public:
   ClientSessionTest() {}
 
   virtual void SetUp() {
     client_jid_ = "user@domain/rest-of-jid";
-    EXPECT_CALL(session_, jid()).WillRepeatedly(ReturnRef(client_jid_));
-
-    connection_ = new MockConnectionToClient(
-        &connection_event_handler_, &host_stub_, &input_stub_);
-
-    EXPECT_CALL(*connection_, session()).WillRepeatedly(Return(&session_));
 
     // Set up a large default screen size that won't affect most tests.
     default_screen_size_.set(1000, 1000);
     EXPECT_CALL(capturer_, size_most_recent())
         .WillRepeatedly(ReturnRef(default_screen_size_));
 
+    protocol::MockSession* session = new MockSession();
+    EXPECT_CALL(*session, jid()).WillRepeatedly(ReturnRef(client_jid_));
+    EXPECT_CALL(*session, SetStateChangeCallback(_));
+
     user_authenticator_ = new MockUserAuthenticator();
     client_session_ = new ClientSession(
         &session_event_handler_,
-        connection_,
-        &input_stub_,
-        &capturer_);
+        new protocol::ConnectionToClient(
+            base::MessageLoopProxy::current(), session),
+        &input_stub_, &capturer_);
   }
 
  protected:
   SkISize default_screen_size_;
   MessageLoop message_loop_;
   std::string client_jid_;
-  MockSession session_;
-  MockConnectionToClientEventHandler connection_event_handler_;
   MockHostStub host_stub_;
   MockInputStub input_stub_;
   MockCapturer capturer_;
   MockClientSessionEventHandler session_event_handler_;
   MockUserAuthenticator* user_authenticator_;
-  scoped_refptr<MockConnectionToClient> connection_;
   scoped_refptr<ClientSession> client_session_;
 };
 
 MATCHER_P2(EqualsKeyEvent, keycode, pressed, "") {
   return arg.keycode() == keycode && arg.pressed() == pressed;
 }
 
 MATCHER_P2(EqualsMouseEvent, x, y, "") {
   return arg.x() == x && arg.y() == y;
 }
@@ skipping 25 matching lines @@
 
   protocol::MouseEvent mouse_event2;
   mouse_event2.set_x(200);
   mouse_event2.set_y(201);
 
   protocol::MouseEvent mouse_event3;
   mouse_event3.set_x(300);
   mouse_event3.set_y(301);
 
   InSequence s;
-  EXPECT_CALL(session_event_handler_, OnAuthenticationComplete(_));
+  EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_));
   EXPECT_CALL(input_stub_, InjectKeyEvent(EqualsKeyEvent(2, true)));
   EXPECT_CALL(input_stub_, InjectKeyEvent(EqualsKeyEvent(2, false)));
   EXPECT_CALL(input_stub_, InjectMouseEvent(EqualsMouseEvent(200, 201)));
 
   // These events should not get through to the input stub,
   // because the client isn't authenticated yet.
   client_session_->InjectKeyEvent(key_event1);
   client_session_->InjectMouseEvent(mouse_event1);
-  client_session_->OnAuthenticationComplete();
+  client_session_->OnConnectionOpened(client_session_->connection());
   // These events should get through to the input stub.
   client_session_->InjectKeyEvent(key_event2_down);
   client_session_->InjectKeyEvent(key_event2_up);
   client_session_->InjectMouseEvent(mouse_event2);
-  client_session_->OnDisconnected();
+  client_session_->Disconnect();
   // These events should not get through to the input stub,
   // because the client has disconnected.
   client_session_->InjectKeyEvent(key_event3);
   client_session_->InjectMouseEvent(mouse_event3);
 }
 
 TEST_F(ClientSessionTest, LocalInputTest) {
   protocol::MouseEvent mouse_event1;
   mouse_event1.set_x(100);
   mouse_event1.set_y(101);
   protocol::MouseEvent mouse_event2;
   mouse_event2.set_x(200);
   mouse_event2.set_y(201);
   protocol::MouseEvent mouse_event3;
   mouse_event3.set_x(300);
   mouse_event3.set_y(301);
 
   InSequence s;
-  EXPECT_CALL(session_event_handler_, OnAuthenticationComplete(_));
+  EXPECT_CALL(session_event_handler_,
+              OnSessionAuthenticated(client_session_.get()));
   EXPECT_CALL(input_stub_, InjectMouseEvent(EqualsMouseEvent(100, 101)));
   EXPECT_CALL(input_stub_, InjectMouseEvent(EqualsMouseEvent(200, 201)));
 
-  client_session_->OnAuthenticationComplete();
+  client_session_->OnConnectionOpened(client_session_->connection());
   // This event should get through to the input stub.
   client_session_->InjectMouseEvent(mouse_event1);
   // This one should too because the local event echoes the remote one.
   client_session_->LocalMouseMoved(SkIPoint::Make(mouse_event1.x(),
                                                   mouse_event1.y()));
   client_session_->InjectMouseEvent(mouse_event2);
   // This one should not.
   client_session_->LocalMouseMoved(SkIPoint::Make(mouse_event1.x(),
                                                   mouse_event1.y()));
   client_session_->InjectMouseEvent(mouse_event3);
   // TODO(jamiewalch): Verify that remote inputs are re-enabled eventually
   // (via dependency injection, not sleep!)
-  client_session_->OnDisconnected();
+  client_session_->Disconnect();
 }
 
 TEST_F(ClientSessionTest, RestoreEventState) {
   protocol::KeyEvent key1;
   key1.set_pressed(true);
   key1.set_keycode(1);
 
   protocol::KeyEvent key2;
   key2.set_pressed(true);
   key2.set_keycode(2);
@@ skipping 12 matching lines @@
       protocol::MouseEvent::BUTTON_LEFT)));
 
   client_session_->RestoreEventState();
 }
 
 TEST_F(ClientSessionTest, ClampMouseEvents) {
   SkISize screen(SkISize::Make(200, 100));
   EXPECT_CALL(capturer_, size_most_recent())
       .WillRepeatedly(ReturnRef(screen));
 
-  EXPECT_CALL(session_event_handler_, OnAuthenticationComplete(_));
-  client_session_->OnAuthenticationComplete();
+  EXPECT_CALL(session_event_handler_,
+              OnSessionAuthenticated(client_session_.get()));
+  client_session_->OnConnectionOpened(client_session_->connection());
 
   int input_x[3] = { -999, 100, 999 };
   int expected_x[3] = { 0, 100, 199 };
   int input_y[3] = { -999, 50, 999 };
   int expected_y[3] = { 0, 50, 99 };
 
   protocol::MouseEvent event;
   for (int j = 0; j < 3; j++) {
     for (int i = 0; i < 3; i++) {
       event.set_x(input_x[i]);
       event.set_y(input_y[j]);
       EXPECT_CALL(input_stub_, InjectMouseEvent(EqualsMouseEvent(
           expected_x[i], expected_y[j])));
       client_session_->InjectMouseEvent(event);
     }
   }
 }
 
 }  // namespace remoting