Fix ChromotingHost and DesktopEnvironmentFactory references to TaskRunners.

remoting/host/remoting_me2me_host.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 file implements a standalone host process for Me2Me.
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 110 matching lines @@
         config_(FilePath()),
 #ifdef OFFICIAL_BUILD
         oauth_use_official_client_id_(true),
 #else
         oauth_use_official_client_id_(false),
 #endif
         allow_nat_traversal_(true),
         restarting_(false),
         shutting_down_(false),
 #if defined(OS_WIN)
         desktop_environment_factory_(new SessionDesktopEnvironmentFactory()),

[alexeypa (please no reviews), 2012/10/02 17:00:13]

SessiondesktopEnviromentFactory's constructor takes two parameters.

 #else  // !defined(OS_WIN)
-        desktop_environment_factory_(new DesktopEnvironmentFactory()),
+        desktop_environment_factory_(new DesktopEnvironmentFactory(
+            context_->input_task_runner(), context_->ui_task_runner())),
 #endif  // !defined(OS_WIN)
         desktop_resizer_(DesktopResizer::Create()),
         exit_code_(kSuccessExitCode)
 #if defined(OS_MACOSX)
       , curtain_(base::Bind(&HostProcess::OnDisconnectRequested,
                             base::Unretained(this)),
                  base::Bind(&HostProcess::OnDisconnectRequested,
                             base::Unretained(this)))
 #endif
   {
@@ skipping 160 matching lines @@
 
     StartWatchingConfigChanges();
   }
 
   int get_exit_code() const { return exit_code_; }
 
  private:
   void ShutdownHostProcess() {
     DCHECK(context_->ui_task_runner()->BelongsToCurrentThread());
 
+    // Tear down resources that use ChromotingHostContext threads.
     config_watcher_.reset();
-
     daemon_channel_.reset();
+    desktop_environment_factory_.reset();
     host_user_interface_.reset();
 
     if (policy_watcher_.get()) {
       base::WaitableEvent done_event(true, false);
       policy_watcher_->StopWatching(&done_event);
       done_event.Wait();
       policy_watcher_.reset();
     }
 
     context_.reset();
@@ skipping 224 matching lines @@
     NetworkSettings network_settings(
         allow_nat_traversal_ ?
         NetworkSettings::NAT_TRAVERSAL_ENABLED :
         NetworkSettings::NAT_TRAVERSAL_DISABLED);
     if (!allow_nat_traversal_) {
       network_settings.min_port = NetworkSettings::kDefaultMinPort;
       network_settings.max_port = NetworkSettings::kDefaultMaxPort;
     }
 
     host_ = new ChromotingHost(
-        context_.get(), signal_strategy_.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());
 
     // TODO(simonmorris): Get the maximum session duration from a policy.
 #if defined(OS_LINUX)
     host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20));
 #endif
 
     heartbeat_sender_.reset(new HeartbeatSender(
         this, host_id_, signal_strategy_.get(), &key_pair_));
 
     log_to_server_.reset(
@@ skipping 246 matching lines @@
             user32.GetFunctionPointer("SetProcessDPIAware"));
     set_process_dpi_aware();
   }
 
   // CommandLine::Init() ignores the passed |argc| and |argv| on Windows getting
   // the command line from GetCommandLineW(), so we can safely pass NULL here.
   return main(0, NULL);
 }
 
 #endif  // defined(OS_WIN)