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

remoting/host/plugin/host_script_object.h

 // Copyright (c) 2012 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 REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
 #define REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 15 matching lines @@
 #include "remoting/host/plugin/daemon_controller.h"
 #include "remoting/host/plugin/host_plugin_utils.h"
 #include "remoting/host/ui_strings.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npfunctions.h"
 #include "third_party/npapi/bindings/npruntime.h"
 
 namespace remoting {
 
 class ChromotingHost;
-class DesktopEnvironmentFactory;
+class DesktopEnvironment;
 class HostEventLogger;
 class It2MeHostUserInterface;
 class MutableHostConfig;
 class RegisterSupportHostRequest;
 class SignalStrategy;
 class SupportAccessVerifier;
 
 namespace policy_hack {
 class PolicyWatcher;
 }  // namespace policy_hack
@@ skipping 144 matching lines @@
   // Callbacks invoked during session setup.
   void OnReceivedSupportID(bool success,
                            const std::string& support_id,
                            const base::TimeDelta& lifetime);
 
   // Helper functions that run on main thread. Can be called on any
   // other thread.
   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().
   void OnShutdownFinished();
 
   // Called when a policy is updated.
   void OnPolicyUpdate(scoped_ptr<base::DictionaryValue> policies);
 
   // Called when the nat traversal policy is updated.
   void UpdateNatPolicy(bool nat_traversal_enabled);
@@ skipping 89 matching lines @@
   ScopedRefNPObject on_nat_traversal_policy_changed_func_;
   ScopedRefNPObject on_state_changed_func_;
   base::PlatformThreadId np_thread_id_;
   scoped_refptr<PluginThreadTaskRunner> plugin_task_runner_;
 
   scoped_ptr<ChromotingHostContext> host_context_;
   HostKeyPair host_key_pair_;
   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_;
 
   scoped_refptr<ChromotingHost> host_;
   int failed_login_attempts_;
 
   UiStrings ui_strings_;
   base::Lock ui_strings_lock_;
 
   base::WaitableEvent disconnected_event_;
@@ skipping 27 matching lines @@
   // SequencedWorkerPool. Problem is that SequencedWorkerPool relies
   // on MessageLoopProxy::current().
   base::Thread worker_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(HostNPScriptObject);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_