Cleanup some chromoting code

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.
 // 2. Accepts connection through libjingle.
 // 3. Receive mouse / keyboard events through libjingle.
 // 4. Sends screen capture through libjingle.
 
 #include <iostream>
 #include <string>
 
 #include "build/build_config.h"
 
 #if defined(OS_POSIX)
 #include <termios.h>
 #endif  // defined (OS_POSIX)
 
 #include "base/at_exit.h"
 #include "base/waitable_event.h"
 #include "remoting/host/capturer_fake.h"
 #include "remoting/host/encoder_verbatim.h"
-#include "remoting/host/simple_host.h"
+#include "remoting/host/chromoting_host.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
 
-void SetConsoleEcho(bool on) {
-#if defined(OS_WIN)
-  HANDLE hIn = GetStdHandle(STD_INPUT_HANDLE);
-  if ((hIn == INVALID_HANDLE_VALUE) || (hIn == NULL))
-    return;
-
-  DWORD mode;
-  if (!GetConsoleMode(hIn, &mode))
-    return;
-
-  if (on) {
-    mode = mode | ENABLE_ECHO_INPUT;
-  } else {
-    mode = mode & ~ENABLE_ECHO_INPUT;
-  }
-
-  SetConsoleMode(hIn, mode);
-#elif defined(OS_POSIX)
-  struct termios settings;
-  tcgetattr(STDIN_FILENO, &settings);
-  if (on) {
-    settings.c_lflag |= ECHO;
-  } else {
-    settings.c_lflag &= ~ECHO;
-  }
-  tcsetattr(STDIN_FILENO, TCSANOW, &settings);
-#endif  //  defined(OS_WIN)
-}
-
 int main(int argc, char** argv) {
   base::AtExitManager exit_manager;
 
   std::string username;
   std::string auth_token;
 
   // Check the argument to see if we should use a fake capturer and encoder.
   bool fake = false;
   // True if the JID was specified on the command line.
   bool has_jid = false;
@@ skipping 44 matching lines @@
   capturer.reset(new remoting::CapturerMac());
   executor.reset(new remoting::EventExecutorMac());
 #endif
   encoder.reset(new remoting::EncoderVerbatim());
 
   if (fake) {
     // Inject a fake capturer.
     capturer.reset(new remoting::CapturerFake());
   }
 
-  // Construct a simple host with username and auth_token.
+  // Construct a chromoting host with username and auth_token.
   // TODO(hclam): Allow the host to load saved credentials.
   base::WaitableEvent host_done(false, false);
-  scoped_refptr<remoting::SimpleHost> host
-      = new remoting::SimpleHost(username, auth_token,
-                                 capturer.release(),
-                                 encoder.release(),
-                                 executor.release(),
-                                 &host_done);
+  scoped_refptr<remoting::ChromotingHost> host
+      = new remoting::ChromotingHost(username, auth_token,
+                                     capturer.release(),
+                                     encoder.release(),
+                                     executor.release(),
+                                     &host_done);
   host->Run();
   host_done.Wait();
   return 0;
 }