Remove authenticated_ fields from stubs.

remoting/host/chromoting_host_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/task.h"
 #include "remoting/host/capturer_fake.h"
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/host_mock_objects.h"
 #include "remoting/host/in_memory_host_config.h"
+#include "remoting/host/user_authenticator_fake.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/protocol_mock_objects.h"
 #include "remoting/protocol/session_config.h"
 #include "testing/gmock_mutant.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::remoting::protocol::LocalLoginCredentials;
 using ::remoting::protocol::MockClientStub;
 using ::remoting::protocol::MockConnectionToClient;
@@ skipping 10 matching lines @@
 using testing::DeleteArg;
 using testing::DoAll;
 using testing::InSequence;
 using testing::InvokeWithoutArgs;
 using testing::Return;
 
 namespace remoting {
 
 namespace {
 
+UserAuthenticator* MakeUserAuthenticator() {
+  return new UserAuthenticatorFake();
+}
+
 void PostQuitTask(MessageLoop* message_loop) {
   message_loop->PostTask(FROM_HERE, new MessageLoop::QuitTask());
 }
 
 // Run the task and delete it afterwards. This action is used to deal with
 // done callbacks.
 ACTION(RunDoneTask) {
   arg1->Run();
   delete arg1;
 }
 
 ACTION_P(QuitMainMessageLoop, message_loop) {
   PostQuitTask(message_loop);
 }
 
+// A task that does nothing.
+class DummyTask : public Task {

[Alpha Left Google, 2011/03/28 16:22:26]

Alternatively you can also do:

void DummyTask() {}
and then NewRunnableFunction(&DummyTask);

but that just saves you some typing, works the same :)

[simonmorris, 2011/03/29 17:07:51]

Done.

+ public:
+  void Run() {}
+};
+
 }  // namespace
 
 class ChromotingHostTest : public testing::Test {
  public:
   ChromotingHostTest() {
   }
 
   virtual void SetUp() {
     config_ = new InMemoryHostConfig();
     ON_CALL(context_, main_message_loop())
@@ skipping 10 matching lines @@
         .Times(AnyNumber());
 
     Capturer* capturer = new CapturerFake(context_.main_message_loop());
     host_stub_ = new MockHostStub();
     host_stub2_ = new MockHostStub();
     input_stub_ = new MockInputStub();
     input_stub2_ = new MockInputStub();
     DesktopEnvironment* desktop =
         new DesktopEnvironment(capturer, input_stub_);
     host_ = ChromotingHost::Create(&context_, config_, desktop);
+    credentials_.set_type(protocol::PASSWORD);
+    credentials_.set_username("user");
+    credentials_.set_credential("password");
     connection_ = new MockConnectionToClient(
         &message_loop_, &handler_, host_stub_, input_stub_);
     connection2_ = new MockConnectionToClient(
         &message_loop_, &handler_, host_stub2_, input_stub2_);
     session_ = new MockSession();
     session2_ = new MockSession();
     session_config_.reset(SessionConfig::CreateDefault());
     session_config2_.reset(SessionConfig::CreateDefault());
 
     ON_CALL(video_stub_, ProcessVideoPacket(_, _))
@@ skipping 37 matching lines @@
 
   }
 
   virtual void TearDown() {
   }
 
   // Helper method to pretend a client is connected to ChromotingHost.
   void SimulateClientConnection(int connection_index) {
     scoped_refptr<MockConnectionToClient> connection =
         (connection_index == 0) ? connection_ : connection2_;
-    scoped_refptr<ClientSession> client = new ClientSession(host_.get(),
-                                                            connection);
+    scoped_refptr<ClientSession> client = new ClientSession(
+        host_.get(),
+        base::Bind(MakeUserAuthenticator),
+        connection,
+        input_stub_);
     connection->set_host_stub(client.get());
 
     context_.network_message_loop()->PostTask(
         FROM_HERE,
         NewRunnableMethod(host_.get(),
                           &ChromotingHost::AddClient,
                           client));
     context_.network_message_loop()->PostTask(
         FROM_HERE,
         NewRunnableMethod(host_.get(),
                           &ChromotingHost::OnClientConnected,
                           connection));
     context_.network_message_loop()->PostTask(
         FROM_HERE,
-        NewRunnableMethod(host_.get(),
-                          &ChromotingHost::LocalLoginSucceeded,
-                          connection));
+        NewRunnableMethod(client.get(),
+                          &ClientSession::BeginSessionRequest,
+                          &credentials_,
+                          new DummyTask()));
   }
 
   // Helper method to remove a client connection from ChromotingHost.
   void RemoveClientConnection() {
     context_.network_message_loop()->PostTask(
         FROM_HERE,
         NewRunnableMethod(host_.get(),
                           &ChromotingHost::OnClientDisconnected,
                           connection_));
   }
 
  protected:
   MessageLoop message_loop_;
   MockConnectionToClientEventHandler handler_;
   scoped_refptr<ChromotingHost> host_;
   scoped_refptr<InMemoryHostConfig> config_;
   MockChromotingHostContext context_;
+  protocol::LocalLoginCredentials credentials_;
   scoped_refptr<MockConnectionToClient> connection_;
   scoped_refptr<MockSession> session_;
   scoped_ptr<SessionConfig> session_config_;
   MockVideoStub video_stub_;
   MockClientStub client_stub_;
   MockHostStub* host_stub_;
   MockInputStub* input_stub_;
   scoped_refptr<MockConnectionToClient> connection2_;
   scoped_refptr<MockSession> session2_;
   scoped_ptr<SessionConfig> session_config2_;
@@ skipping 118 matching lines @@
   EXPECT_CALL(*connection_.get(), Disconnect())
       .RetiresOnSaturation();
   EXPECT_CALL(*connection2_.get(), Disconnect())
       .RetiresOnSaturation();
 
   SimulateClientConnection(0);
   message_loop_.Run();
 }
 
 }  // namespace remoting