| Index: remoting/host/chromoting_host_unittest.cc
|
| diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc
|
| index 5338c080771088911aad2eb709968a0c0e58d462..8aef5a0cba0fdea41e291655b162ead59f2c0bd1 100644
|
| --- a/remoting/host/chromoting_host_unittest.cc
|
| +++ b/remoting/host/chromoting_host_unittest.cc
|
| @@ -2,12 +2,14 @@
|
| // 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"
|
| @@ -38,6 +40,10 @@ namespace remoting {
|
|
|
| namespace {
|
|
|
| +UserAuthenticator* MakeUserAuthenticator() {
|
| + return new UserAuthenticatorFake();
|
| +}
|
| +
|
| void PostQuitTask(MessageLoop* message_loop) {
|
| message_loop->PostTask(FROM_HERE, new MessageLoop::QuitTask());
|
| }
|
| @@ -53,6 +59,8 @@ ACTION_P(QuitMainMessageLoop, message_loop) {
|
| PostQuitTask(message_loop);
|
| }
|
|
|
| +void DummyFunction() {}
|
| +
|
| } // namespace
|
|
|
| class ChromotingHostTest : public testing::Test {
|
| @@ -83,6 +91,9 @@ class ChromotingHostTest : public testing::Test {
|
| 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(
|
| @@ -140,8 +151,11 @@ class ChromotingHostTest : public testing::Test {
|
| 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(
|
| @@ -156,9 +170,10 @@ class ChromotingHostTest : public testing::Test {
|
| connection));
|
| context_.network_message_loop()->PostTask(
|
| FROM_HERE,
|
| - NewRunnableMethod(host_.get(),
|
| - &ChromotingHost::LocalLoginSucceeded,
|
| - connection));
|
| + NewRunnableMethod(client.get(),
|
| + &ClientSession::BeginSessionRequest,
|
| + &credentials_,
|
| + NewRunnableFunction(&DummyFunction)));
|
| }
|
|
|
| // Helper method to remove a client connection from ChromotingHost.
|
| @@ -176,6 +191,7 @@ class ChromotingHostTest : public testing::Test {
|
| 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_;
|
|
|