Revert 155574 - [Chromoting] Refactoring DesktopEnvironment and moving screen/audio recorders to Cl…

remoting/host/plugin/host_script_object.h

Index: remoting/host/plugin/host_script_object.h
===================================================================
--- remoting/host/plugin/host_script_object.h	(revision 155615)
+++ remoting/host/plugin/host_script_object.h	(working copy)
@@ -33,7 +33,7 @@
 namespace remoting {
 
 class ChromotingHost;
-class DesktopEnvironmentFactory;
+class DesktopEnvironment;
 class HostEventLogger;
 class It2MeHostUserInterface;
 class MutableHostConfig;
@@ -198,10 +198,12 @@
   void ReadPolicyAndConnect(const std::string& uid,
                             const std::string& auth_token,
                             const std::string& auth_service);
-  void FinishConnect(const std::string& uid,
-                     const std::string& auth_token,
-                     const std::string& auth_service);
-
+  void FinishConnectMainThread(const std::string& uid,
+                               const std::string& auth_token,
+                               const std::string& auth_service);
+  void FinishConnectNetworkThread(const std::string& uid,
+                                  const std::string& auth_token,
+                                  const std::string& auth_service);
   void DisconnectInternal();
 
   // Callback for ChromotingHost::Shutdown().
@@ -311,7 +313,7 @@
   scoped_ptr<SignalStrategy> signal_strategy_;
   scoped_ptr<RegisterSupportHostRequest> register_request_;
   scoped_ptr<LogToServer> log_to_server_;
-  scoped_ptr<DesktopEnvironmentFactory> desktop_environment_factory_;
+  scoped_ptr<DesktopEnvironment> desktop_environment_;
   scoped_ptr<It2MeHostUserInterface> it2me_host_user_interface_;
   scoped_ptr<HostEventLogger> host_event_logger_;