[Chromoting] Refactoring DesktopEnvironment and moving screen/audio recorders to ClientSession.

remoting/host/plugin/host_script_object.h

Index: remoting/host/plugin/host_script_object.h
diff --git a/remoting/host/plugin/host_script_object.h b/remoting/host/plugin/host_script_object.h
index abb67346da35a2657b7bd8c0cd9da2c8de1d4596..a1bb4fe8abc3c9f11aa29e9852c824beb53591b9 100644
--- a/remoting/host/plugin/host_script_object.h
+++ b/remoting/host/plugin/host_script_object.h
@@ -33,7 +33,7 @@
 namespace remoting {
 
 class ChromotingHost;
-class DesktopEnvironment;
+class DesktopEnvironmentFactory;
 class HostEventLogger;
 class It2MeHostUserInterface;
 class MutableHostConfig;
@@ -198,12 +198,10 @@ class HostNPScriptObject : public HostStatusObserver {
   void ReadPolicyAndConnect(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 FinishConnect(const std::string& uid,
+                     const std::string& auth_token,
+                     const std::string& auth_service);
+
   void DisconnectInternal();
 
   // Callback for ChromotingHost::Shutdown().
@@ -313,7 +311,7 @@ class HostNPScriptObject : public HostStatusObserver {
   scoped_ptr<SignalStrategy> signal_strategy_;
   scoped_ptr<RegisterSupportHostRequest> register_request_;
   scoped_ptr<LogToServer> log_to_server_;
-  scoped_ptr<DesktopEnvironment> desktop_environment_;
+  scoped_ptr<DesktopEnvironmentFactory> desktop_environment_factory_;
   scoped_ptr<It2MeHostUserInterface> it2me_host_user_interface_;
   scoped_ptr<HostEventLogger> host_event_logger_;