Move creation of capturer, input stub into ChromotingHost

remoting/host/simple_host_process.cc

Index: remoting/host/simple_host_process.cc
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index 0a6ff42d5dded2181366a9e6091ff26da722bf69..931b90dff0b45524c77c1209ba20892562181589 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -36,17 +36,6 @@
 #include "remoting/proto/video.pb.h"
 
 #if defined(OS_WIN)
-#include "remoting/host/capturer_gdi.h"
-#include "remoting/host/event_executor_win.h"
-#elif defined(OS_LINUX)
-#include "remoting/host/capturer_linux.h"
-#include "remoting/host/event_executor_linux.h"
-#elif defined(OS_MACOSX)
-#include "remoting/host/capturer_mac.h"
-#include "remoting/host/event_executor_mac.h"
-#endif
-
-#if defined(OS_WIN)
 const std::wstring kDefaultConfigPath = L".ChromotingConfig.json";
 const wchar_t kHomeDrive[] = L"HOMEDRIVE";
 const wchar_t kHomePath[] = L"HOMEPATH";
@@ -77,27 +66,6 @@ int main(int argc, char** argv) {
   remoting::ChromotingHostContext context;
   context.Start();
 
-  scoped_ptr<remoting::Capturer> capturer;
-  scoped_ptr<remoting::protocol::InputStub> input_stub;
-#if defined(OS_WIN)
-  capturer.reset(new remoting::CapturerGdi(
-      context.capture_message_loop()));
-  input_stub.reset(new remoting::EventExecutorWin(
-      context.capture_message_loop(), capturer.get()));
-#elif defined(OS_LINUX)
-  capturer.reset(new remoting::CapturerLinux(
-      context.capture_message_loop()));
-  input_stub.reset(new remoting::EventExecutorLinux(
-      context.capture_message_loop(), capturer.get()));
-#elif defined(OS_MACOSX)
-  capturer.reset(new remoting::CapturerMac(
-      context.capture_message_loop()));
-  input_stub.reset(new remoting::EventExecutorMac(
-      context.capture_message_loop(), capturer.get()));
-#endif
-
-  // Check the argument to see if we should use a fake capturer.
-  bool fake = cmd_line->HasSwitch(kFakeSwitchName);
 
 #if defined(OS_WIN)
   std::wstring home_path = GetEnvironmentVar(kHomeDrive);
@@ -111,12 +79,6 @@ int main(int argc, char** argv) {
     config_path = cmd_line->GetSwitchValuePath(kConfigSwitchName);
   }
 
-  if (fake) {
-    // Inject a fake capturer.

[Sergey Ulanov, 2010/11/17 03:29:19]

Can you please not break fake capturer?

-    LOG(INFO) << "Using a fake capturer.";
-    capturer.reset(new remoting::CapturerFake(context.capture_message_loop()));
-  }
-
   base::Thread file_io_thread("FileIO");
   file_io_thread.Start();
 
@@ -137,10 +99,7 @@ int main(int argc, char** argv) {
 
   // Construct a chromoting host.
   scoped_refptr<remoting::ChromotingHost> host(
-      new remoting::ChromotingHost(&context,
-                                   config,
-                                   capturer.release(),
-                                   input_stub.release()));
+      new remoting::ChromotingHost(&context, config));
 
   // Let the chromoting host run until the shutdown task is executed.
   MessageLoop message_loop(MessageLoop::TYPE_UI);