Move BlimpInputManager to BlimpDocument from BlimpCompositor.

blimp/client/core/render_widget/blimp_document_manager_unittest.cc

Index: blimp/client/core/render_widget/blimp_document_manager_unittest.cc
diff --git a/blimp/client/core/render_widget/blimp_document_manager_unittest.cc b/blimp/client/core/render_widget/blimp_document_manager_unittest.cc
index d38fe64525e293d399db653100a8abbfdc645591..6b9dbe060f945b7db7c234fdded8bf77b0d4107a 100644
--- a/blimp/client/core/render_widget/blimp_document_manager_unittest.cc
+++ b/blimp/client/core/render_widget/blimp_document_manager_unittest.cc
@@ -19,6 +19,7 @@
 
 using testing::_;
 using testing::InSequence;
+using testing::Return;

[Khushal, 2016/10/07 03:40:15]

Not used?

[xingliu, 2016/10/10 19:00:17]

Done.

 using testing::Sequence;
 
 namespace blimp {
@@ -35,7 +36,6 @@ class MockBlimpCompositor : public BlimpCompositor {
       : BlimpCompositor(compositor_dependencies, client) {}
 
   MOCK_METHOD1(SetVisible, void(bool));
-  MOCK_METHOD1(OnTouchEvent, bool(const ui::MotionEvent& motion_event));
 
   void OnCompositorMessageReceived(
       std::unique_ptr<cc::proto::CompositorMessage> message) override {
@@ -52,13 +52,14 @@ class MockBlimpDocument : public BlimpDocument {
                              BlimpDocumentManager* document_manager)
       : BlimpDocument(render_widget_id, compositor_deps, document_manager) {
     SetCompositorForTest(
-        base::MakeUnique<MockBlimpCompositor>(compositor_deps, this));
+        base::MakeUnique<MockBlimpCompositor>(compositor_deps, this),
+        compositor_deps);
   }
 
   using BlimpDocument::GetCompositor;
 
   MOCK_METHOD1(SetVisible, void(bool));
-  MOCK_METHOD1(OnTouchEvent, bool(const ui::MotionEvent& motion_event));
+  MOCK_METHOD1(OnTouchEvent, bool(const ui::MotionEvent&));
 };
 
 class BlimpDocumentManagerForTesting : public BlimpDocumentManager {
@@ -183,7 +184,7 @@ TEST_F(BlimpDocumentManagerTest, ForwardsViewEventsToCorrectCompositor) {
   SetUpDocuments();
 
   EXPECT_CALL(*mock_compositor1_, SetVisible(true));
-  EXPECT_CALL(*mock_compositor1_, OnTouchEvent(_));
+  EXPECT_CALL(*mock_document1_, OnTouchEvent(_));
   EXPECT_CALL(*mock_compositor1_, SetVisible(false));
 
   EXPECT_CALL(*mock_compositor2_, SetVisible(true));