Fix ChromotingHost and DesktopEnvironmentFactory references to TaskRunners.

remoting/host/simple_host_process.cc

 // Copyright (c) 2012 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.
 //
 // This is an application of a minimal host process in a Chromoting
 // system. It serves the purpose of gluing different pieces together
 // to make a functional host process for testing.
 //
 // It peforms the following functionality:
 // 1. Connect to the GTalk network and register the machine as a host.
@@ skipping 24 matching lines @@
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/base/constants.h"
 #include "remoting/host/audio_capturer.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/desktop_environment_factory.h"
 #include "remoting/host/dns_blackhole_checker.h"
 #include "remoting/host/event_executor.h"
+#include "remoting/host/event_executor_fake.h"
 #include "remoting/host/heartbeat_sender.h"
 #include "remoting/host/host_exit_codes.h"
 #include "remoting/host/host_key_pair.h"
 #include "remoting/host/host_secret.h"
 #include "remoting/host/it2me_host_user_interface.h"
 #include "remoting/host/json_host_config.h"
 #include "remoting/host/log_to_server.h"
 #include "remoting/host/network_settings.h"
 #include "remoting/host/register_support_host_request.h"
 #include "remoting/host/session_manager_factory.h"
@@ skipping 39 matching lines @@
 
 }  // namespace
 
 namespace remoting {
 
 class FakeDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
  public:
   FakeDesktopEnvironmentFactory();
   virtual ~FakeDesktopEnvironmentFactory();
 
-  virtual scoped_ptr<DesktopEnvironment> Create(
-      ChromotingHostContext* context) OVERRIDE;
+  virtual scoped_ptr<DesktopEnvironment> Create() OVERRIDE;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(FakeDesktopEnvironmentFactory);
 };
 
-FakeDesktopEnvironmentFactory::FakeDesktopEnvironmentFactory() {
+  FakeDesktopEnvironmentFactory::FakeDesktopEnvironmentFactory()
+    : DesktopEnvironmentFactory(NULL, NULL) {
 }
 
 FakeDesktopEnvironmentFactory::~FakeDesktopEnvironmentFactory() {
 }
 
-scoped_ptr<DesktopEnvironment> FakeDesktopEnvironmentFactory::Create(
-    ChromotingHostContext* context) {
+scoped_ptr<DesktopEnvironment> FakeDesktopEnvironmentFactory::Create() {
   scoped_ptr<VideoFrameCapturer> capturer(new VideoFrameCapturerFake());
-  scoped_ptr<EventExecutor> event_executor = EventExecutor::Create(
-      context->desktop_task_runner(),
-      context->ui_task_runner());
-  scoped_ptr<AudioCapturer> audio_capturer(NULL);
+  scoped_ptr<EventExecutor> event_executor(new EventExecutorFake());
   return scoped_ptr<DesktopEnvironment>(new DesktopEnvironment(
-      audio_capturer.Pass(),
+      scoped_ptr<AudioCapturer>(NULL),
       event_executor.Pass(),
       capturer.Pass()));
 }
 
 class SimpleHost : public HeartbeatSender::Listener {
  public:
   SimpleHost()
       : message_loop_(MessageLoop::TYPE_UI),
         context_(new AutoThreadTaskRunner(message_loop_.message_loop_proxy())),
         fake_(false),
@@ skipping 121 matching lines @@
         xmpp_login_, xmpp_auth_token_, xmpp_auth_service_));
     scoped_ptr<DnsBlackholeChecker> dns_blackhole_checker(
         new DnsBlackholeChecker(&context_, kDefaultHostTalkGadgetPrefix));
     signaling_connector_.reset(new SignalingConnector(
         signal_strategy_.get(), &context_, dns_blackhole_checker.Pass(),
         base::Bind(&SimpleHost::OnAuthFailed, base::Unretained(this))));
 
     if (fake_) {
       desktop_environment_factory_.reset(new FakeDesktopEnvironmentFactory());
     } else {
-      desktop_environment_factory_.reset(new DesktopEnvironmentFactory());
+      desktop_environment_factory_.reset(new DesktopEnvironmentFactory(
+          context_.input_task_runner(), context_.ui_task_runner()));
     }
 
     host_ = new ChromotingHost(
-        &context_, signal_strategy_.get(), desktop_environment_factory_.get(),
+        signal_strategy_.get(), desktop_environment_factory_.get(),
         CreateHostSessionManager(network_settings_,
-                                 context_.url_request_context_getter()));
+                                 context_.url_request_context_getter()),
+        context_.capture_task_runner(),
+        context_.encode_task_runner(),
+        context_.network_task_runner());
 
     ServerLogEntry::Mode mode =
         is_it2me_ ? ServerLogEntry::IT2ME : ServerLogEntry::ME2ME;
     log_to_server_.reset(new LogToServer(host_, mode, signal_strategy_.get()));
 
     if (is_it2me_) {
       it2me_host_user_interface_.reset(new It2MeHostUserInterface(&context_));
       it2me_host_user_interface_->Start(
           host_,
           base::Bind(&ChromotingHost::Shutdown, host_, base::Closure()));
@@ skipping 178 matching lines @@
         max_port < 0 || max_port > 65535) {
       LOG(ERROR) << "Invalid max-port value: " << max_port
                  << ". Expected integer in range [0, 65535].";
       return 1;
     }
     simple_host.network_settings()->max_port = max_port;
   }
 
   return simple_host.Run();
 }