Add BlimpDocument, pull out functions in BlimpCompositor.

blimp/client/core/compositor/blimp_compositor_unittest.cc

Index: blimp/client/core/compositor/blimp_compositor_unittest.cc
diff --git a/blimp/client/core/compositor/blimp_compositor_unittest.cc b/blimp/client/core/compositor/blimp_compositor_unittest.cc
index 138250450148742ca5587037a106091d14e081eb..ef4e2219789f81750eab39782796f1ada89bbb99 100644
--- a/blimp/client/core/compositor/blimp_compositor_unittest.cc
+++ b/blimp/client/core/compositor/blimp_compositor_unittest.cc
@@ -26,18 +26,16 @@ class MockBlimpCompositorClient : public BlimpCompositorClient {
   ~MockBlimpCompositorClient() override = default;
 
   void SendWebGestureEvent(
-      int render_widget_id,
       const blink::WebGestureEvent& gesture_event) override {
-    MockableSendWebGestureEvent(render_widget_id);
+    MockableSendWebGestureEvent();
   }
   void SendCompositorMessage(
-      int render_widget_id,
       const cc::proto::CompositorMessage& message) override {
-    MockableSendCompositorMessage(render_widget_id);
+    MockableSendCompositorMessage();
   }
 
-  MOCK_METHOD1(MockableSendWebGestureEvent, void(int));
-  MOCK_METHOD1(MockableSendCompositorMessage, void(int));
+  MOCK_METHOD0(MockableSendWebGestureEvent, void());
+  MOCK_METHOD0(MockableSendCompositorMessage, void());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockBlimpCompositorClient);
@@ -46,10 +44,9 @@ class MockBlimpCompositorClient : public BlimpCompositorClient {
 class BlimpCompositorForTesting : public BlimpCompositor {
  public:
   BlimpCompositorForTesting(
-      int render_widget_id,
       BlimpCompositorDependencies* compositor_dependencies,
       BlimpCompositorClient* client)
-      : BlimpCompositor(render_widget_id, compositor_dependencies, client) {}
+      : BlimpCompositor(compositor_dependencies, client) {}
 
   void SendProto(const cc::proto::CompositorMessage& proto) {
     SendCompositorProto(proto);
@@ -64,14 +61,14 @@ class BlimpCompositorForTesting : public BlimpCompositor {
 
 class BlimpCompositorTest : public testing::Test {
  public:
-  BlimpCompositorTest() : render_widget_id_(1), loop_(new base::MessageLoop) {}
+  BlimpCompositorTest() : loop_(new base::MessageLoop) {}
 
   void SetUp() override {
     compositor_dependencies_ = base::MakeUnique<BlimpCompositorDependencies>(
         base::MakeUnique<MockCompositorDependencies>());
 
     compositor_ = base::MakeUnique<BlimpCompositorForTesting>(
-        render_widget_id_, compositor_dependencies_.get(), &compositor_client_);
+        compositor_dependencies_.get(), &compositor_client_);
   }
 
   void TearDown() override {
@@ -81,7 +78,6 @@ class BlimpCompositorTest : public testing::Test {
 
   ~BlimpCompositorTest() override {}
 
-  int render_widget_id_;
   std::unique_ptr<base::MessageLoop> loop_;
   MockBlimpCompositorClient compositor_client_;
   std::unique_ptr<BlimpCompositorDependencies> compositor_dependencies_;
@@ -101,12 +97,8 @@ TEST_F(BlimpCompositorTest, ToggleVisibilityWithHost) {
 }
 
 TEST_F(BlimpCompositorTest, MessagesHaveCorrectId) {
-  EXPECT_CALL(compositor_client_,
-              MockableSendCompositorMessage(render_widget_id_))
-      .Times(1);
-  EXPECT_CALL(compositor_client_,
-              MockableSendWebGestureEvent(render_widget_id_))
-      .Times(1);
+  EXPECT_CALL(compositor_client_, MockableSendCompositorMessage()).Times(1);
+  EXPECT_CALL(compositor_client_, MockableSendWebGestureEvent()).Times(1);
 
   compositor_->SendProto(cc::proto::CompositorMessage());
   compositor_->SendGestureEvent(blink::WebGestureEvent());