Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

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 81 matching lines @@
 
   bool damaged;
   bool display_resized_;
   bool has_new_root_surface;
   bool swapped;
 };
 
 class DisplayTest : public testing::Test {
  public:
   DisplayTest()
-      : factory_(&manager_, &surface_factory_client_),
+      : factory_(kArbitraryFrameSinkId, &manager_, &surface_factory_client_),
         id_allocator_(kArbitraryFrameSinkId),
         task_runner_(new base::NullTaskRunner) {
-    manager_.RegisterFrameSinkId(id_allocator_.frame_sink_id());
+    manager_.RegisterFrameSinkId(kArbitraryFrameSinkId);
   }
 
   ~DisplayTest() override {
-    manager_.InvalidateFrameSinkId(id_allocator_.frame_sink_id());
+    manager_.InvalidateFrameSinkId(kArbitraryFrameSinkId);
   }
 
   void SetUpDisplay(const RendererSettings& settings,
                     std::unique_ptr<TestWebGraphicsContext3D> context) {
     std::unique_ptr<BeginFrameSource> begin_frame_source(
         new StubBeginFrameSource);
 
     std::unique_ptr<FakeOutputSurface> output_surface;
     if (context) {
       output_surface = FakeOutputSurface::Create3d(std::move(context));
@@ skipping 55 matching lines @@
 }
 
 // Check that frame is damaged and swapped only under correct conditions.
 TEST_F(DisplayTest, DisplayDamaged) {
   RendererSettings settings;
   settings.partial_swap_enabled = true;
   settings.finish_rendering_on_resize = true;
   SetUpDisplay(settings, nullptr);
 
   StubDisplayClient client;
-  display_->Initialize(&client, &manager_, id_allocator_.frame_sink_id());
+  display_->Initialize(&client, &manager_, kArbitraryFrameSinkId);
 
   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);
 
   scheduler_->ResetDamageForTest();
@@ skipping 242 matching lines @@
   settings.partial_swap_enabled = true;
   settings.finish_rendering_on_resize = true;
 
   std::unique_ptr<MockedContext> context(new MockedContext());
   MockedContext* context_ptr = context.get();
   EXPECT_CALL(*context_ptr, shallowFinishCHROMIUM()).Times(0);
 
   SetUpDisplay(settings, std::move(context));
 
   StubDisplayClient client;
-  display_->Initialize(&client, &manager_, id_allocator_.frame_sink_id());
+  display_->Initialize(&client, &manager_, kArbitraryFrameSinkId);
 
   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