Move BlimpInputManager to BlimpDocument from BlimpCompositor.

blimp/client/core/compositor/blimp_compositor.h

Index: blimp/client/core/compositor/blimp_compositor.h
diff --git a/blimp/client/core/compositor/blimp_compositor.h b/blimp/client/core/compositor/blimp_compositor.h
index 60bebcb3088b8fd696d900056aca39b7db6a9bb9..af61ef64495511d2bc444f65ac771c0f790f10cc 100644
--- a/blimp/client/core/compositor/blimp_compositor.h
+++ b/blimp/client/core/compositor/blimp_compositor.h
@@ -10,8 +10,8 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/threading/thread_checker.h"
 #include "blimp/client/core/compositor/blimp_compositor_frame_sink_proxy.h"
-#include "blimp/client/core/input/blimp_input_manager.h"
 #include "blimp/client/public/compositor/compositor_dependencies.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/trees/layer_tree_host.h"
@@ -27,6 +27,8 @@ class Thread;
 }  // namespace base
 
 namespace cc {
+class InputHandler;
+
 namespace proto {
 class CompositorMessage;
 }  // namespace proto
@@ -54,11 +56,6 @@ class BlimpCompositorDependencies;
 // render widget of this compositor on the engine.
 class BlimpCompositorClient {
  public:
-  // Should send web gesture events which could not be handled locally by the
-  // compositor to the engine.
-  virtual void SendWebGestureEvent(
-      const blink::WebGestureEvent& gesture_event) = 0;
-
   // Should send the compositor messages from the remote client LayerTreeHost of
   // this compositor to the corresponding remote server LayerTreeHost.
   virtual void SendCompositorMessage(
@@ -79,7 +76,6 @@ class BlimpCompositorClient {
 // This class should only be accessed from the main thread.
 class BlimpCompositor : public cc::LayerTreeHostClient,
                         public cc::RemoteProtoChannel,
-                        public BlimpInputManagerClient,
                         public BlimpCompositorFrameSinkProxy,
                         public cc::SurfaceFactoryClient {
  public:
@@ -90,10 +86,6 @@ class BlimpCompositor : public cc::LayerTreeHostClient,
 
   virtual void SetVisible(bool visible);
 
-  // Forwards the touch event to the |input_manager_|.
-  // virtual for testing.
-  virtual bool OnTouchEvent(const ui::MotionEvent& motion_event);
-
   // Notifies |callback| when all pending commits have been drawn to the screen.
   // If this compositor is destroyed or becomes hidden |callback| will be
   // notified.
@@ -107,6 +99,10 @@ class BlimpCompositor : public cc::LayerTreeHostClient,
 
   scoped_refptr<cc::Layer> layer() const { return layer_; }
 
+  // Returns a reference to the InputHandler used to respond to input events on
+  // the compositor thread.
+  const base::WeakPtr<cc::InputHandler>& GetInputHandler();
+
  private:
   friend class BlimpCompositorForTesting;
 
@@ -135,10 +131,6 @@ class BlimpCompositor : public cc::LayerTreeHostClient,
   void SetProtoReceiver(ProtoReceiver* receiver) override;
   void SendCompositorProto(const cc::proto::CompositorMessage& proto) override;
 
-  // BlimpInputManagerClient implementation.
-  void SendWebGestureEvent(
-      const blink::WebGestureEvent& gesture_event) override;
-
   // BlimpCompositorFrameSinkProxy implementation.
   void BindToProxyClient(
       base::WeakPtr<BlimpCompositorFrameSinkProxyClient> proxy_client) override;
@@ -208,13 +200,6 @@ class BlimpCompositor : public cc::LayerTreeHostClient,
   // to |render_widget_id_|.
   cc::RemoteProtoChannel::ProtoReceiver* remote_proto_channel_receiver_;
 
-  // Handles input events for the current render widget. The lifetime of the
-  // input manager is tied to the lifetime of the |host_| which owns the
-  // cc::InputHandler. The input events are forwarded to this input handler by
-  // the manager to be handled by the client compositor for the current render
-  // widget.
-  std::unique_ptr<BlimpInputManager> input_manager_;
-
   // The number of times a START_COMMIT proto has been received but a call to
   // DidCommitAndDrawFrame hasn't been seen.  This should track the number of
   // outstanding commits.