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

This CL changes the way screen/audio recorders and event executors are managed. New DesktopEnvironmentFactory class is now used by ChromotingHost's owner to specify the kind of desktop environment (or virtual terminal) to be used by the host. Screen/audio recorders and event executors now owned by the ClientSession instance, so there is a separate set of recorders and stubs exists for each authenticated client session. Clients sessions can now be torn dowsn in parallel with the host shuttting down.

This is the 3rd attempt to land this change. This version includes:
- |ClientSession| objects are torn down asynchronously now.
- |ClientSession| objects are ref-counted to facilitate the asynchronous shutdown. They still have to be used and destroyed on the network thread.
- |ChromotingHost| now waits until all connections are torn down before deleting the session manager.
- The unit tests were fixed to run message loops until all asynchronous object have been destroyed.

BUG=134694
TEST=remoting_unittests

Review URL: https://chromiumcodereview.appspot.com/10915206

TBR=alexeypa@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10911248

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156298 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 32 insertions, 11 deletions

diff --git a/remoting/host/desktop_environment.h b/remoting/host/desktop_environment.h
index a653c78e..8b32a89 100644
--- a/remoting/host/desktop_environment.h
+++ b/remoting/host/desktop_environment.h
@@ -5,6 +5,8 @@
 #ifndef REMOTING_HOST_DESKTOP_ENVIRONMENT_H_
 #define REMOTING_HOST_DESKTOP_ENVIRONMENT_H_
 
+#include <string>
+
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 
@@ -21,28 +23,47 @@ class ClipboardStub;
 
 class DesktopEnvironment {
  public:
-  DesktopEnvironment(scoped_ptr<AudioCapturer> audio_capturer,
-                     scoped_ptr<EventExecutor> event_executor,
-                     scoped_ptr<VideoFrameCapturer> video_capturer);
+  // Creates a DesktopEnvironment used in a host plugin.
+  static scoped_ptr<DesktopEnvironment> Create(
+      ChromotingHostContext* context);
+
+  // Creates a DesktopEnvironment used in a service process.
+  static scoped_ptr<DesktopEnvironment> CreateForService(
+      ChromotingHostContext* context);
+
+  static scoped_ptr<DesktopEnvironment> CreateFake(
+      ChromotingHostContext* context,
+      scoped_ptr<VideoFrameCapturer> capturer,
+      scoped_ptr<EventExecutor> event_executor,
+      scoped_ptr<AudioCapturer> audio_capturer);
+
   virtual ~DesktopEnvironment();
 
-  AudioCapturer* audio_capturer() const { return audio_capturer_.get(); }
+  VideoFrameCapturer* capturer() const { return capturer_.get(); }
   EventExecutor* event_executor() const { return event_executor_.get(); }
-  VideoFrameCapturer* video_capturer() const { return video_capturer_.get(); }
-
-  virtual void Start(
-      scoped_ptr<protocol::ClipboardStub> client_clipboard);
+  AudioCapturer* audio_capturer() const { return audio_capturer_.get(); }
+  void OnSessionStarted(scoped_ptr<protocol::ClipboardStub> client_clipboard);
+  void OnSessionFinished();
 
  private:
+  DesktopEnvironment(ChromotingHostContext* context,
+                     scoped_ptr<VideoFrameCapturer> capturer,
+                     scoped_ptr<EventExecutor> event_executor,
+                     scoped_ptr<AudioCapturer> audio_capturer);
+
+  // Host context used to make sure operations are run on the correct thread.
+  // This is owned by the ChromotingHost.
+  ChromotingHostContext* context_;
+
+  // Used to capture video to deliver to clients.
+  scoped_ptr<VideoFrameCapturer> capturer_;
+
   // Used to capture audio to deliver to clients.
   scoped_ptr<AudioCapturer> audio_capturer_;
 
   // Executes input and clipboard events received from the client.
   scoped_ptr<EventExecutor> event_executor_;
 
-  // Used to capture video to deliver to clients.
-  scoped_ptr<VideoFrameCapturer> video_capturer_;
-
   DISALLOW_COPY_AND_ASSIGN(DesktopEnvironment);
 };