Revert 55507 - Start chromoting host in the service process though a method ...

chrome/service/service_process.h

 // 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.
 
 #ifndef CHROME_SERVICE_SERVICE_PROCESS_H_
 #define CHROME_SERVICE_SERVICE_PROCESS_H_
 #pragma once
 
-#include "base/gtest_prod_util.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/thread.h"
 #include "base/waitable_event.h"
 
 class CloudPrintProxy;
 class JsonPrefStore;
 class ServiceIPCServer;
 namespace net {
 class NetworkChangeNotifier;
 }
 
 namespace remoting {
 class ChromotingHost;
 class ChromotingHostContext;
-class JsonHostConfig;
+class MutableHostConfig;
 }
 
 // The ServiceProcess does not inherit from ChildProcess because this
 // process can live independently of the browser process.
 class ServiceProcess {
  public:
   ServiceProcess();
   ~ServiceProcess();
 
-  // Initialize the ServiceProcess with the message loop that it should run on.
-  bool Initialize(MessageLoop* message_loop);
+  bool Initialize();
   bool Teardown();
   // TODO(sanjeevr): Change various parts of the code such as
   // net::ProxyService::CreateSystemProxyConfigService to take in
   // MessageLoopProxy* instead of MessageLoop*. When we have done that, we can
   // remove the io_thread() and file_thread() accessors and replace them with
   // io_message_loop_proxy() and file_message_loop_proxy() respectively.
 
   // Returns the thread that we perform I/O coordination on (network requests,
   // communication with renderers, etc.
   // NOTE: You should ONLY use this to pass to IPC or other objects which must
@@ skipping 12 matching lines @@
   }
 
   // A global event object that is signalled when the main thread's message
   // loop exits. This gives background threads a way to observe the main
   // thread shutting down.
   base::WaitableEvent* shutdown_event() {
     return &shutdown_event_;
   }
 
   CloudPrintProxy* GetCloudPrintProxy();
-
 #if defined(ENABLE_REMOTING)
-  // Return the reference to the chromoting host only if it has started.
-  remoting::ChromotingHost* GetChromotingHost() { return chromoting_host_; }
-
-  // Start running the chromoting host asynchronously.
-  // Return true if chromoting host has started.
-  bool StartChromotingHost();
-
-  // Shutdown chromoting host. Return true if chromoting host was shutdown.
-  // The shutdown process will happen asynchronously.
-  bool ShutdownChromotingHost();
+  remoting::ChromotingHost* CreateChromotingHost(
+      remoting::ChromotingHostContext* context,
+      remoting::MutableHostConfig* config);
 #endif
 
  private:
-#if defined(ENABLE_REMOTING)
-  FRIEND_TEST(ServiceProcessTest, RunChromoting);
-  FRIEND_TEST_ALL_PREFIXES(ServiceProcessTest, RunChromotingUntilShutdown);
-
-  // Save authenication token to the json config file.
-  void SaveChromotingConfig(
-      const std::string& login,
-      const std::string& token,
-      const std::string& host_id,
-      const std::string& host_name,
-      const std::string& private_key);
-
-  // Load settings for chromoting from json file.
-  void LoadChromotingConfig();
-
-  // This method is called when chromoting is shutting down. This is virtual
-  // for used in the test.
-  virtual void OnChromotingHostShutdown();
-#endif
-
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   scoped_ptr<base::Thread> io_thread_;
   scoped_ptr<base::Thread> file_thread_;
   scoped_ptr<CloudPrintProxy> cloud_print_proxy_;
   scoped_ptr<JsonPrefStore> service_prefs_;
   scoped_ptr<ServiceIPCServer> ipc_server_;
-
-#if defined(ENABLE_REMOTING)
-  scoped_refptr<remoting::JsonHostConfig> chromoting_config_;
-  scoped_ptr<remoting::ChromotingHostContext> chromoting_context_;
-  scoped_refptr<remoting::ChromotingHost> chromoting_host_;
-#endif
   // An event that will be signalled when we shutdown.
   base::WaitableEvent shutdown_event_;
 
-  // The main message loop for the service process.
-  MessageLoop* main_message_loop_;
-
   DISALLOW_COPY_AND_ASSIGN(ServiceProcess);
 };
 
 extern ServiceProcess* g_service_process;
 
 #endif  // CHROME_SERVICE_SERVICE_PROCESS_H_
+