Expose Blimp dependencies to the embedder

blimp/client/feature/compositor/blimp_compositor_manager_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_compositor_manager.h"
 
 #include "base/memory/ptr_util.h"
-#include "blimp/client/feature/compositor/blimp_gpu_memory_buffer_manager.h"
+#include "blimp/client/core/compositor/blimp_compositor_dependencies.h"
+#include "blimp/client/core/compositor/blob_image_serialization_processor.h"
+#include "blimp/client/feature/compositor/mock_compositor_dependencies.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"
 #include "ui/events/gesture_detection/motion_event_generic.h"
 
 using testing::_;
 using testing::InSequence;
 using testing::Sequence;
 
 namespace blimp {
 namespace client {
 namespace {
 
 class MockRenderWidgetFeature : public RenderWidgetFeature {
  public:
   MOCK_METHOD3(SendCompositorMessage,
                void(const int,
                     const int,
                     const cc::proto::CompositorMessage&));
   MOCK_METHOD3(SendInputEvent, void(const int,
                                     const int,
                                     const blink::WebInputEvent&));
   MOCK_METHOD2(SetDelegate, void(int, RenderWidgetFeatureDelegate*));
   MOCK_METHOD1(RemoveDelegate, void(const int));
 };
 
 class MockBlimpCompositor : public BlimpCompositor {
- public :
-  explicit MockBlimpCompositor(const int render_widget_id,
-                               cc::SurfaceManager* surface_manager,
-                               int surface_client_id,
-                               BlimpCompositorClient* client)
-      : BlimpCompositor(render_widget_id,
-                        surface_manager,
-                        surface_client_id,
-                        client) {}
+ public:
+  explicit MockBlimpCompositor(
+      const int render_widget_id,
+      BlimpCompositorDependencies* compositor_dependencies,
+      BlimpCompositorClient* client)
+      : BlimpCompositor(render_widget_id, 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 {
     MockableOnCompositorMessageReceived(*message);
   }
   MOCK_METHOD1(MockableOnCompositorMessageReceived,
                void(const cc::proto::CompositorMessage&));
 };
 
 class BlimpCompositorManagerForTesting : public BlimpCompositorManager {
  public:
   explicit BlimpCompositorManagerForTesting(
       RenderWidgetFeature* render_widget_feature,
-      cc::SurfaceManager* surface_manager,
-      BlimpGpuMemoryBufferManager* gpu_memory_buffer_manager,
-      SurfaceIdAllocationCallback callback)
-      : BlimpCompositorManager(render_widget_feature,
-                               surface_manager,
-                               gpu_memory_buffer_manager,
-                               callback) {}
+      BlimpCompositorDependencies* compositor_dependencies)
+      : BlimpCompositorManager(render_widget_feature, compositor_dependencies) {
+  }
 
   using BlimpCompositorManager::GetCompositor;
 
   std::unique_ptr<BlimpCompositor> CreateBlimpCompositor(
       int render_widget_id,
-      cc::SurfaceManager* surface_manager,
-      uint32_t surface_client_id,
+      BlimpCompositorDependencies* compositor_dependencies,
       BlimpCompositorClient* client) override {
     return base::WrapUnique(new MockBlimpCompositor(
-        render_widget_id, surface_manager, surface_client_id, client));
+        render_widget_id, compositor_dependencies, client));
   }
 };
 
 class BlimpCompositorManagerTest : public testing::Test {
  public:
   void SetUp() override {
     EXPECT_CALL(render_widget_feature_, SetDelegate(_, _)).Times(1);
     EXPECT_CALL(render_widget_feature_, RemoveDelegate(_)).Times(1);
 
-    surface_manager_ = base::MakeUnique<cc::SurfaceManager>();
-    compositor_manager_.reset(new BlimpCompositorManagerForTesting(
-        &render_widget_feature_, surface_manager_.get(),
-        &gpu_memory_buffer_manager_,
-        base::Bind(&BlimpCompositorManagerTest::AllocateId,
-                   base::Unretained(this))));
+    compositor_dependencies_ = base::WrapUnique(new BlimpCompositorDependencies(
+        base::WrapUnique(new MockCompositorDependencies())));

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

MakeUnique.

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

Done.

+
+    compositor_manager_ = base::MakeUnique<BlimpCompositorManagerForTesting>(
+        &render_widget_feature_, compositor_dependencies_.get());
   }
 
   void TearDown() override {
     mock_compositor1_ = nullptr;
     mock_compositor2_ = nullptr;
     compositor_manager_.reset();
-    surface_manager_.reset();
+    compositor_dependencies_.reset();
   }
 
-  uint32_t AllocateId() { return ++id_; }
-
   void SetUpCompositors() {
     delegate()->OnRenderWidgetCreated(1);
     delegate()->OnRenderWidgetCreated(2);
 
     mock_compositor1_ = static_cast<MockBlimpCompositor*>
       (compositor_manager_->GetCompositor(1));
     mock_compositor2_ = static_cast<MockBlimpCompositor*>
       (compositor_manager_->GetCompositor(2));
 
     EXPECT_NE(mock_compositor1_, nullptr);
     EXPECT_NE(mock_compositor2_, nullptr);
 
     EXPECT_EQ(mock_compositor1_->render_widget_id(), 1);
     EXPECT_EQ(mock_compositor2_->render_widget_id(), 2);
   }
 
   RenderWidgetFeature::RenderWidgetFeatureDelegate* delegate() const {
     DCHECK(compositor_manager_);
     return static_cast<RenderWidgetFeature::RenderWidgetFeatureDelegate*>
         (compositor_manager_.get());
   }
 
-  uint32_t id_ = 1;
+  std::unique_ptr<BlimpCompositorDependencies> compositor_dependencies_;
   std::unique_ptr<BlimpCompositorManagerForTesting> compositor_manager_;
-  std::unique_ptr<cc::SurfaceManager> surface_manager_;
-  BlimpGpuMemoryBufferManager gpu_memory_buffer_manager_;
+  BlobImageSerializationProcessor blob_image_serialization_processor_;
   MockRenderWidgetFeature render_widget_feature_;
   MockBlimpCompositor* mock_compositor1_;
   MockBlimpCompositor* mock_compositor2_;
 };
 
 TEST_F(BlimpCompositorManagerTest, ForwardsMessagesToCorrectCompositor) {
   SetUpCompositors();
 
   // Ensure that the compositor messages for a render widget are forwarded to
   // the correct compositor.
@@ skipping 50 matching lines @@
   // events forwarded after this.
   delegate()->OnRenderWidgetDeleted(1);
   delegate()->OnRenderWidgetDeleted(2);
 
   compositor_manager_->SetVisible(true);
 }
 
 }  // namespace
 }  // namespace client
 }  // namespace blimp