Revert "Fix crashes in ChromotingHost"

remoting/host/simple_host_process.cc

 // Copyright (c) 2010 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 14 matching lines @@
 #include "base/logging.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/nss_util.h"
 #include "base/path_service.h"
 #include "base/threading/thread.h"
 #include "media/base/media.h"
 #include "remoting/base/tracer.h"
 #include "remoting/host/capturer_fake.h"
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/chromoting_host_context.h"
-#include "remoting/host/event_executor.h"
 #include "remoting/host/json_host_config.h"
 #include "remoting/proto/video.pb.h"
 
 using remoting::ChromotingHost;
 using remoting::protocol::CandidateSessionConfig;
 using remoting::protocol::ChannelConfig;
 using std::string;
 using std::wstring;
 
 #if defined(OS_WIN)
@@ skipping 64 matching lines @@
   FilePath module_path;
   PathService::Get(base::DIR_MODULE, &module_path);
   CHECK(media::InitializeMediaLibrary(module_path))
       << "Cannot load media library";
 
   // Construct a chromoting host.
   scoped_refptr<ChromotingHost> host;
 
   bool fake = cmd_line->HasSwitch(kFakeSwitchName);
   if (fake) {
-    remoting::Capturer* capturer =
-        new remoting::CapturerFake(context.main_message_loop());
-    remoting::protocol::InputStub* input_stub =
-        CreateEventExecutor(context.main_message_loop(), capturer);
     host = ChromotingHost::Create(
-        &context, config, capturer, input_stub);
+        &context, config,
+        new remoting::CapturerFake(context.main_message_loop()));
   } else {
     host = ChromotingHost::Create(&context, config);
   }
 
   if (cmd_line->HasSwitch(kVideoSwitchName)) {
     string video_codec = cmd_line->GetSwitchValueASCII(kVideoSwitchName);
     scoped_ptr<CandidateSessionConfig> config(
         CandidateSessionConfig::CreateDefault());
     config->mutable_video_configs()->clear();
 
@@ skipping 21 matching lines @@
   // Let the chromoting host run until the shutdown task is executed.
   MessageLoop message_loop(MessageLoop::TYPE_UI);
   host->Start(NewRunnableFunction(&ShutdownTask, &message_loop));
   message_loop.Run();
 
   // And then stop the chromoting context.
   context.Stop();
   file_io_thread.Stop();
   return 0;
 }