Remove old Authentication code that we don't use or need.

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 {
@@ skipping 18 matching lines @@
     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);
-    ON_CALL(capturer_, size_most_recent()).WillByDefault(ReturnRef(
-        default_screen_size_));
+    EXPECT_CALL(capturer_, size_most_recent())
+        .WillRepeatedly(ReturnRef(default_screen_size_));

[Wez, 2011/11/03 00:25:02]

Is this fixing up an existing issue with the test, i.e. not CL-related?

[Sergey Ulanov, 2011/11/03 01:21:12]

yes, I cleaned up some minor warnings in the tests when when debugging tests for
this CL.

 
     user_authenticator_ = new MockUserAuthenticator();
     client_session_ = new ClientSession(
         &session_event_handler_,
-        user_authenticator_,
         connection_,
         &input_stub_,
         &capturer_);
   }
 
  protected:
   SkISize default_screen_size_;
   MessageLoop message_loop_;
   std::string client_jid_;
   MockSession session_;
@@ skipping 41 matching lines @@
   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);
 
-  protocol::LocalLoginCredentials credentials;
-  credentials.set_type(protocol::PASSWORD);
-  credentials.set_username("user");
-  credentials.set_credential("password");
-
   InSequence s;
-  EXPECT_CALL(*user_authenticator_, Authenticate(_, _))
-      .WillOnce(Return(true));
-  EXPECT_CALL(session_event_handler_, LocalLoginSucceeded(_));
+  EXPECT_CALL(session_event_handler_, OnAuthorizationComplete(_));
   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_->BeginSessionRequest(&credentials, base::Closure());
+  client_session_->OnAuthorizationComplete();
   // 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();
   // 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);
 
-  protocol::LocalLoginCredentials credentials;
-  credentials.set_type(protocol::PASSWORD);
-  credentials.set_username("user");
-  credentials.set_credential("password");
-
   InSequence s;
-  EXPECT_CALL(*user_authenticator_, Authenticate(_, _))
-      .WillOnce(Return(true));
-  EXPECT_CALL(session_event_handler_, LocalLoginSucceeded(_));
+  EXPECT_CALL(session_event_handler_, OnAuthorizationComplete(_));
   EXPECT_CALL(input_stub_, InjectMouseEvent(EqualsMouseEvent(100, 101)));
   EXPECT_CALL(input_stub_, InjectMouseEvent(EqualsMouseEvent(200, 201)));
 
-  client_session_->BeginSessionRequest(&credentials, base::Closure());
+  client_session_->OnAuthorizationComplete();
   // 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);
@@ skipping 25 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));
 
-  protocol::LocalLoginCredentials credentials;
-  credentials.set_type(protocol::PASSWORD);
-  credentials.set_username("user");
-  credentials.set_credential("password");
-  EXPECT_CALL(*user_authenticator_, Authenticate(_, _))
-      .WillOnce(Return(true));
-  EXPECT_CALL(session_event_handler_, LocalLoginSucceeded(_));
-  client_session_->BeginSessionRequest(&credentials, base::Closure());
+  EXPECT_CALL(session_event_handler_, OnAuthorizationComplete(_));
+  client_session_->OnAuthorizationComplete();
 
   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