Expose Blimp dependencies to the embedder

blimp/client/feature/compositor/blimp_compositor_unittest.cc

 // Copyright 2016 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.
 
-#include <blimp/client/feature/compositor/blimp_gpu_memory_buffer_manager.h>
 #include "blimp/client/feature/compositor/blimp_compositor.h"
 
 #include "base/threading/thread_task_runner_handle.h"
+#include "blimp/client/core/compositor/blimp_compositor_dependencies.h"
+#include "blimp/client/core/compositor/blimp_task_graph_runner.h"
 #include "blimp/client/core/compositor/blob_image_serialization_processor.h"
-#include "blimp/common/compositor/blimp_task_graph_runner.h"
+#include "blimp/client/feature/compositor/mock_compositor_dependencies.h"
 #include "cc/layers/layer.h"
 #include "cc/proto/compositor_message.pb.h"
 #include "cc/surfaces/surface_manager.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 
 namespace blimp {
 namespace client {
 
 class MockBlimpCompositorClient : public BlimpCompositorClient {
  public:
-  MockBlimpCompositorClient() : compositor_thread_("Compositor") {
-    compositor_thread_.Start();
-  }
-  ~MockBlimpCompositorClient() override { compositor_thread_.Stop(); }
-
-  cc::LayerTreeSettings* GetLayerTreeSettings() override { return &settings_; }
-  scoped_refptr<base::SingleThreadTaskRunner> GetCompositorTaskRunner() override
-      { return compositor_thread_.task_runner(); }
-  cc::TaskGraphRunner* GetTaskGraphRunner() override {
-    return &task_graph_runner_; }
-  gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override {
-    return &gpu_memory_buffer_manager_;
-  }
-  cc::ImageSerializationProcessor* GetImageSerializationProcessor() override {
-    return BlobImageSerializationProcessor::current();
-  }
+  MockBlimpCompositorClient() = default;
+  ~MockBlimpCompositorClient() override = default;
 
   void SendWebGestureEvent(
       int render_widget_id,
       const blink::WebGestureEvent& gesture_event) override {
     MockableSendWebGestureEvent(render_widget_id);
   }
   void SendCompositorMessage(
       int render_widget_id,
       const cc::proto::CompositorMessage& message) override {
     MockableSendCompositorMessage(render_widget_id);
   }
 
   MOCK_METHOD1(MockableSendWebGestureEvent, void(int));
   MOCK_METHOD1(MockableSendCompositorMessage, void(int));
 
-  cc::LayerTreeSettings settings_;
-  base::Thread compositor_thread_;
-  BlimpTaskGraphRunner task_graph_runner_;
-  BlimpGpuMemoryBufferManager gpu_memory_buffer_manager_;
-  BlobImageSerializationProcessor serialization_processor_;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(MockBlimpCompositorClient);
 };
 
 class BlimpCompositorForTesting : public BlimpCompositor {
  public:
-  BlimpCompositorForTesting(int render_widget_id,
-                            cc::SurfaceManager* surface_manager,
-                            uint32_t surface_client_id,
-                            BlimpCompositorClient* client)
-      : BlimpCompositor(render_widget_id,
-                        surface_manager,
-                        surface_client_id,
-                        client) {}
+  BlimpCompositorForTesting(
+      int render_widget_id,
+      BlimpCompositorDependencies* compositor_dependencies,
+      BlimpCompositorClient* client)
+      : BlimpCompositor(render_widget_id, compositor_dependencies, client) {}
 
   void SendProto(const cc::proto::CompositorMessage& proto) {
     SendCompositorProto(proto);
   }
 
   void SendGestureEvent(const blink::WebGestureEvent& gesture_event) {
     SendWebGestureEvent(gesture_event);
   }
 
   cc::LayerTreeHost* host() const { return host_.get(); }
 };
 
 class BlimpCompositorTest : public testing::Test {
  public:
   BlimpCompositorTest() : render_widget_id_(1), loop_(new base::MessageLoop) {}
 
   void SetUp() override {
-    surface_manager_ = base::MakeUnique<cc::SurfaceManager>();
-    compositor_.reset(new BlimpCompositorForTesting(
-        render_widget_id_, surface_manager_.get(), surface_client_id_++,
-        &compositor_client_));
+    compositor_dependencies_ = base::WrapUnique(new BlimpCompositorDependencies(

[Khushal, 2016/08/25 05:02:54]

MakeUnique. :(

[David Trainor- moved to gerrit, 2016/08/26 17:15:54]

Sorry still hadn't done a personal final pass on this yet.  Thanks for catching.

+        base::WrapUnique(new MockCompositorDependencies())));
+
+    compositor_ = base::MakeUnique<BlimpCompositorForTesting>(
+        render_widget_id_, compositor_dependencies_.get(), &compositor_client_);
   }
 
   void TearDown() override {
     compositor_.reset();
-    surface_manager_.reset();
+    compositor_dependencies_.reset();
   }
 
   ~BlimpCompositorTest() override {}
 
   void SendInitializeMessage() {
     std::unique_ptr<cc::proto::CompositorMessage> message;
     message.reset(new cc::proto::CompositorMessage);
     cc::proto::CompositorMessageToImpl* to_impl =
         message->mutable_to_impl();
     to_impl->set_message_type(
         cc::proto::CompositorMessageToImpl::INITIALIZE_IMPL);
     cc::proto::InitializeImpl* initialize_message =
         to_impl->mutable_initialize_impl_message();
     cc::LayerTreeSettings settings;
     settings.ToProtobuf(initialize_message->mutable_layer_tree_settings());
     compositor_->OnCompositorMessageReceived(std::move(message));
   }
 
   void SendShutdownMessage() {
     std::unique_ptr<cc::proto::CompositorMessage> message;
     message.reset(new cc::proto::CompositorMessage);
     cc::proto::CompositorMessageToImpl* to_impl =
         message->mutable_to_impl();
     to_impl->set_message_type(cc::proto::CompositorMessageToImpl::CLOSE_IMPL);
     compositor_->OnCompositorMessageReceived(std::move(message));
   }
 
   int render_widget_id_;
-  std::unique_ptr<cc::SurfaceManager> surface_manager_;
-  uint32_t surface_client_id_ = 1;
   std::unique_ptr<base::MessageLoop> loop_;
   MockBlimpCompositorClient compositor_client_;
+  std::unique_ptr<BlimpCompositorDependencies> compositor_dependencies_;
   std::unique_ptr<BlimpCompositorForTesting> compositor_;
+  BlobImageSerializationProcessor blob_image_serialization_processor_;
 };
 
 TEST_F(BlimpCompositorTest, ToggleVisibilityWithHost) {
   // Make the compositor visible when we don't have a host.
   compositor_->SetVisible(true);
   SendInitializeMessage();
 
   // Check that the visibility is set correctly on the host.
   EXPECT_NE(compositor_->host(), nullptr);
   EXPECT_TRUE(compositor_->host()->visible());
@@ skipping 24 matching lines @@
               MockableSendCompositorMessage(render_widget_id_)).Times(1);
   EXPECT_CALL(compositor_client_,
               MockableSendWebGestureEvent(render_widget_id_)).Times(1);
 
   compositor_->SendProto(cc::proto::CompositorMessage());
   compositor_->SendGestureEvent(blink::WebGestureEvent());
 }
 
 }  // namespace client
 }  // namespace blimp