Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1712)

Unified Diff: remoting/host/chromoting_host_unittest.cc

Issue 11018004: Fix ChromotingHost and DesktopEnvironmentFactory references to TaskRunners. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Windows build. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/chromoting_host_context_unittest.cc ('k') | remoting/host/desktop_environment_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/chromoting_host_unittest.cc
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc
index ae1687c9838ef00ee0fa04640b5bbbe1b33c17ba..e1f3694e27aeb0f8f9a85a65959d3ccc197ebe7c 100644
--- a/remoting/host/chromoting_host_unittest.cc
+++ b/remoting/host/chromoting_host_unittest.cc
@@ -71,21 +71,20 @@ class MockDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
MockDesktopEnvironmentFactory();
virtual ~MockDesktopEnvironmentFactory();
- virtual scoped_ptr<DesktopEnvironment> Create(
- ChromotingHostContext* context) OVERRIDE;
+ virtual scoped_ptr<DesktopEnvironment> Create() OVERRIDE;
private:
DISALLOW_COPY_AND_ASSIGN(MockDesktopEnvironmentFactory);
};
-MockDesktopEnvironmentFactory::MockDesktopEnvironmentFactory() {
+MockDesktopEnvironmentFactory::MockDesktopEnvironmentFactory()
+ : DesktopEnvironmentFactory(NULL, NULL) {
}
MockDesktopEnvironmentFactory::~MockDesktopEnvironmentFactory() {
}
-scoped_ptr<DesktopEnvironment> MockDesktopEnvironmentFactory::Create(
- ChromotingHostContext* context) {
+scoped_ptr<DesktopEnvironment> MockDesktopEnvironmentFactory::Create() {
scoped_ptr<EventExecutor> event_executor(new EventExecutorFake());
scoped_ptr<VideoFrameCapturer> video_capturer(new VideoFrameCapturerFake());
return scoped_ptr<DesktopEnvironment>(new DesktopEnvironment(
@@ -122,8 +121,12 @@ class ChromotingHostTest : public testing::Test {
session_manager_ = new protocol::MockSessionManager();
host_ = new ChromotingHost(
- &context_, &signal_strategy_, desktop_environment_factory_.get(),
- scoped_ptr<protocol::SessionManager>(session_manager_));
+ &signal_strategy_,
+ desktop_environment_factory_.get(),
+ scoped_ptr<protocol::SessionManager>(session_manager_),
+ context_.capture_task_runner(),
+ context_.encode_task_runner(),
+ context_.network_task_runner());
host_->AddStatusObserver(&host_status_observer_);
disconnect_window_ = new MockDisconnectWindow();
@@ -223,7 +226,7 @@ class ChromotingHostTest : public testing::Test {
PassAs<protocol::ConnectionToClient>();
protocol::ConnectionToClient* connection_ptr = connection.get();
scoped_ptr<DesktopEnvironment> desktop_environment =
- host_->desktop_environment_factory_->Create(&context_);
+ host_->desktop_environment_factory_->Create();
connection_ptr->set_input_stub(desktop_environment->event_executor());
scoped_refptr<ClientSession> client = new ClientSession(
@@ -232,7 +235,7 @@ class ChromotingHostTest : public testing::Test {
context_.encode_task_runner(),
context_.network_task_runner(),
connection.Pass(),
- host_->desktop_environment_factory_->Create(&context_),
+ desktop_environment.Pass(),
base::TimeDelta());
connection_ptr->set_host_stub(client);
« no previous file with comments | « remoting/host/chromoting_host_context_unittest.cc ('k') | remoting/host/desktop_environment_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698