Delete OnscreenDisplayClient and TopLevelDisplayClient.

cc/surfaces/display_unittest.cc

 // Copyright 2015 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 "cc/surfaces/display.h"
 
 #include <utility>
 
 #include "base/test/null_task_runner.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 85 matching lines @@
   FakeSurfaceFactoryClient surface_factory_client_;
   SurfaceFactory factory_;
   SurfaceIdAllocator id_allocator_;
   TestSoftwareOutputDevice* software_output_device_;
   std::unique_ptr<FakeOutputSurface> output_surface_;
   FakeOutputSurface* output_surface_ptr_;
   scoped_refptr<base::NullTaskRunner> task_runner_;
   std::unique_ptr<SharedBitmapManager> shared_bitmap_manager_;
 };
 
-class TestDisplayClient : public DisplayClient {
+class StubDisplayClient : public DisplayClient {
  public:
-  TestDisplayClient() {}
-  ~TestDisplayClient() override {}
-
-  void OutputSurfaceLost() override {}
-  void SetMemoryPolicy(const ManagedMemoryPolicy& policy) override {}
+  void DisplayOutputSurfaceLost() override {}
+  void DisplaySetMemoryPolicy(const ManagedMemoryPolicy& policy) override {}
 };
 
 class TestDisplayScheduler : public DisplayScheduler {
  public:
   TestDisplayScheduler(DisplaySchedulerClient* client,
                        BeginFrameSource* begin_frame_source,
                        base::SingleThreadTaskRunner* task_runner)
       : DisplayScheduler(client, begin_frame_source, task_runner, 1),
         damaged(false),
         display_resized_(false),
@@ skipping 25 matching lines @@
   bool display_resized_;
   bool has_new_root_surface;
   bool swapped;
 
  private:
   RendererSettings settings_;
 };
 
 class TestDisplay : public Display {
  public:
-  TestDisplay(DisplayClient* client,
-              SurfaceManager* manager,
+  TestDisplay(SurfaceManager* manager,
               SharedBitmapManager* bitmap_manager,
               gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
               const RendererSettings& settings,
-              uint32_t compositor_surface_namespace)
-      : Display(client,
-                manager,
+              uint32_t compositor_surface_namespace,
+              base::SingleThreadTaskRunner* task_runner,
+              std::unique_ptr<OutputSurface> output_surface)
+      : Display(manager,
                 bitmap_manager,
                 gpu_memory_buffer_manager,
                 settings,
-                compositor_surface_namespace) {}
+                compositor_surface_namespace,
+                task_runner,
+                std::move(output_surface)),
+        task_runner_(task_runner) {}
 
   TestDisplayScheduler& scheduler() {
     return *static_cast<TestDisplayScheduler*>(scheduler_.get());
   }
 
  protected:
-  void CreateScheduler(base::SingleThreadTaskRunner* task_runner) override {
-    scheduler_.reset(
-        new TestDisplayScheduler(this, vsync_begin_frame_source_, task_runner));
+  void CreateScheduler() override {
+    scheduler_.reset(new TestDisplayScheduler(this, vsync_begin_frame_source_,
+                                              task_runner_));
   }
+
+ private:
+  base::SingleThreadTaskRunner* task_runner_;
 };
 
 void CopyCallback(bool* called, std::unique_ptr<CopyOutputResult> result) {
   *called = true;
 }
 
 // Check that frame is damaged and swapped only under correct conditions.
 TEST_F(DisplayTest, DisplayDamaged) {
   SetUpContext(nullptr);
-  TestDisplayClient client;
+  StubDisplayClient client;
   RendererSettings settings;
   settings.partial_swap_enabled = true;
   settings.finish_rendering_on_resize = true;
-  TestDisplay display(&client, &manager_, shared_bitmap_manager_.get(), nullptr,
-                      settings, id_allocator_.id_namespace());
-  display.Initialize(std::move(output_surface_), task_runner_.get());
+  TestDisplay display(&manager_, shared_bitmap_manager_.get(), nullptr,
+                      settings, id_allocator_.id_namespace(),
+                      task_runner_.get(), std::move(output_surface_));
+  display.Initialize(&client);
   TestDisplayScheduler& scheduler = display.scheduler();
 
   SurfaceId surface_id(id_allocator_.GenerateId());
   EXPECT_FALSE(scheduler.damaged);
   EXPECT_FALSE(scheduler.has_new_root_surface);
   display.SetSurfaceId(surface_id, 1.f);
   EXPECT_FALSE(scheduler.damaged);
   EXPECT_FALSE(scheduler.display_resized_);
   EXPECT_TRUE(scheduler.has_new_root_surface);
 
@@ skipping 240 matching lines @@
 
 TEST_F(DisplayTest, Finish) {
   std::unique_ptr<MockedContext> context(new MockedContext());
   MockedContext* context_ptr = context.get();
   SetUpContext(std::move(context));
 
   EXPECT_CALL(*context_ptr, shallowFinishCHROMIUM()).Times(0);
 
   SurfaceId surface_id(id_allocator_.GenerateId());
 
-  TestDisplayClient client;
+  StubDisplayClient client;
   RendererSettings settings;
   settings.partial_swap_enabled = true;
   settings.finish_rendering_on_resize = true;
-  TestDisplay display(&client, &manager_, shared_bitmap_manager_.get(), nullptr,
-                      settings, surface_id.id_namespace());
-  display.Initialize(std::move(output_surface_), task_runner_.get());
+  TestDisplay display(&manager_, shared_bitmap_manager_.get(), nullptr,
+                      settings, surface_id.id_namespace(), task_runner_.get(),
+                      std::move(output_surface_));
+  display.Initialize(&client);
 
   display.SetSurfaceId(surface_id, 1.f);
 
   display.Resize(gfx::Size(100, 100));
   factory_.Create(surface_id);
 
   {
     RenderPassList pass_list;
     std::unique_ptr<RenderPass> pass = RenderPass::Create();
     pass->output_rect = gfx::Rect(0, 0, 100, 100);
@@ skipping 36 matching lines @@
 
   EXPECT_CALL(*context_ptr, shallowFinishCHROMIUM());
   display.Resize(gfx::Size(250, 250));
   testing::Mock::VerifyAndClearExpectations(context_ptr);
 
   factory_.Destroy(surface_id);
 }
 
 }  // namespace
 }  // namespace cc