Hook up BeginFrameSource to SurfaceFactoryClient via SurfaceManager

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 17 matching lines @@
 
 namespace cc {
 namespace {
 
 class FakeSurfaceFactoryClient : public SurfaceFactoryClient {
  public:
   FakeSurfaceFactoryClient() : begin_frame_source_(nullptr) {}
 
   void ReturnResources(const ReturnedResourceArray& resources) override {}
 
-  void SetBeginFrameSource(SurfaceId surface_id,
-                           BeginFrameSource* begin_frame_source) override {
+  void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override {
     begin_frame_source_ = begin_frame_source;
   }
 
   BeginFrameSource* begin_frame_source() { return begin_frame_source_; }
 
  private:
   BeginFrameSource* begin_frame_source_;
 };
 
 class TestSoftwareOutputDevice : public SoftwareOutputDevice {
@@ skipping 97 matching lines @@
   bool damaged;
   bool display_resized_;
   bool has_new_root_surface;
   bool swapped;
 };
 
 void CopyCallback(bool* called, scoped_ptr<CopyOutputResult> result) {
   *called = true;
 }
 
-// Verify Display responds to SurfaceAggregatorClient methods properly.
-TEST_F(DisplayTest, DisplayAsSurfaceAggregatorClient) {
-  SetUpContext(nullptr);
-  TestDisplayClient client;
-  RendererSettings settings;
-  Display display(&client, &manager_, shared_bitmap_manager_.get(), nullptr,
-                  settings);
-
-  TestDisplayScheduler scheduler(&display, &fake_begin_frame_source_,
-                                 task_runner_.get());
-  display.Initialize(std::move(output_surface_), &scheduler);
-
-  SurfaceId surface_id(6);
-  factory_.Create(surface_id);
-  Surface* surface = manager_.GetSurfaceForId(surface_id);
-
-  EXPECT_EQ(nullptr, surface_factory_client_.begin_frame_source());
-  display.AddSurface(surface);
-  EXPECT_NE(nullptr, surface_factory_client_.begin_frame_source());
-  display.RemoveSurface(surface);
-  EXPECT_EQ(nullptr, surface_factory_client_.begin_frame_source());
-}
-
 // Check that frame is damaged and swapped only under correct conditions.
 TEST_F(DisplayTest, DisplayDamaged) {
   SetUpContext(nullptr);
   TestDisplayClient client;
   RendererSettings settings;
   settings.partial_swap_enabled = true;
   settings.finish_rendering_on_resize = true;
   Display display(&client, &manager_, shared_bitmap_manager_.get(), nullptr,
                   settings);
 
@@ skipping 316 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