Revert 175648 because it causes http://crbug.com/169126.

remoting/host/client_session.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_CLIENT_SESSION_H_
 #define REMOTING_HOST_CLIENT_SESSION_H_
 
 #include <list>
 
 #include "base/memory/ref_counted.h"
@@ skipping 115 matching lines @@
   void Disconnect();
 
   // Stops the ClientSession, and calls |stopped_task| on |network_task_runner_|
   // when fully stopped.
   void Stop(const base::Closure& stopped_task);
 
   protocol::ConnectionToClient* connection() const {
     return connection_.get();
   }
 
+  DesktopEnvironment* desktop_environment() const {
+    return desktop_environment_.get();
+  }
+
   const std::string& client_jid() { return client_jid_; }
 
   bool is_authenticated() { return auth_input_filter_.enabled();  }
 
   // Indicate that local mouse activity has been detected. This causes remote
   // inputs to be ignored for a short time so that the local user will always
   // have the upper hand in 'pointer wars'.
   void LocalMouseMoved(const SkIPoint& new_pos);
 
   // Disable handling of input events from this client. If the client has any
@@ skipping 24 matching lines @@
   scoped_ptr<protocol::ConnectionToClient> connection_;
 
   // Used to disable callbacks to |connection_| once it is disconnected.
   base::WeakPtrFactory<protocol::ConnectionToClient> connection_factory_;
 
   // The desktop environment used by this session.
   scoped_ptr<DesktopEnvironment> desktop_environment_;
 
   std::string client_jid_;
 
-  // Filter used as the final element in the input pipeline.
-  protocol::InputFilter host_input_filter_;
+  // The host clipboard and input stubs to which this object delegates.
+  // These are the final elements in the clipboard & input pipelines, which
+  // appear in order below.
+  protocol::ClipboardStub* host_clipboard_stub_;
+  protocol::InputStub* host_input_stub_;
 
   // Tracker used to release pressed keys and buttons when disconnecting.
   protocol::InputEventTracker input_tracker_;
 
   // Filter used to disable remote inputs during local input activity.
   RemoteInputFilter remote_input_filter_;
 
   // Filter used to clamp mouse events to the current display dimensions.
   MouseClampingFilter mouse_clamping_filter_;
 
   // Filter to used to stop clipboard items sent from the client being echoed
-  // back to it.  It is the final element in the clipboard (client -> host)
-  // pipeline.
+  // back to it.
   protocol::ClipboardEchoFilter clipboard_echo_filter_;
 
   // Filters used to manage enabling & disabling of input & clipboard.
   protocol::InputFilter disable_input_filter_;
   protocol::ClipboardFilter disable_clipboard_filter_;
 
   // Filters used to disable input & clipboard when we're not authenticated.
   protocol::InputFilter auth_input_filter_;
   protocol::ClipboardFilter auth_clipboard_filter_;
 
@@ skipping 31 matching lines @@
 };
 
 // Destroys |ClienSession| instances on the network thread.
 struct ClientSessionTraits {
   static void Destruct(const ClientSession* client);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CLIENT_SESSION_H_