Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

cc/surfaces/direct_compositor_frame_sink_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/direct_compositor_frame_sink.h"
 
 #include <memory>
 
 #include "cc/output/renderer_settings.h"
 #include "cc/output/texture_mailbox_deleter.h"
@@ skipping 15 matching lines @@
 namespace cc {
 namespace {
 
 static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1);
 
 class DirectCompositorFrameSinkTest : public testing::Test {
  public:
   DirectCompositorFrameSinkTest()
       : now_src_(new base::SimpleTestTickClock()),
         task_runner_(new OrderedSimpleTaskRunner(now_src_.get(), true)),
-        allocator_(kArbitraryFrameSinkId),
         display_size_(1920, 1080),
         display_rect_(display_size_),
         context_provider_(TestContextProvider::Create()) {
-    surface_manager_.RegisterFrameSinkId(allocator_.frame_sink_id());
+    surface_manager_.RegisterFrameSinkId(kArbitraryFrameSinkId);
 
     std::unique_ptr<FakeOutputSurface> display_output_surface =
         FakeOutputSurface::Create3d();
     display_output_surface_ = display_output_surface.get();
 
     std::unique_ptr<BeginFrameSource> begin_frame_source(
         new BackToBackBeginFrameSource(
             base::MakeUnique<DelayBasedTimeSource>(task_runner_.get())));
 
     int max_frames_pending = 2;
     std::unique_ptr<DisplayScheduler> scheduler(new DisplayScheduler(
         begin_frame_source.get(), task_runner_.get(), max_frames_pending));
 
     display_.reset(new Display(
         &bitmap_manager_, &gpu_memory_buffer_manager_, RendererSettings(),
         std::move(begin_frame_source), std::move(display_output_surface),
         std::move(scheduler),
         base::MakeUnique<TextureMailboxDeleter>(task_runner_.get())));
     compositor_frame_sink_.reset(new DirectCompositorFrameSink(
-        &surface_manager_, &allocator_, display_.get(), context_provider_,
-        nullptr));
+        kArbitraryFrameSinkId, &surface_manager_, display_.get(),
+        context_provider_, nullptr));
 
     compositor_frame_sink_->BindToClient(&compositor_frame_sink_client_);
     display_->Resize(display_size_);
     display_->SetVisible(true);
 
     EXPECT_FALSE(
         compositor_frame_sink_client_.did_lose_compositor_frame_sink_called());
   }
 
   ~DirectCompositorFrameSinkTest() override {}
@@ skipping 17 matching lines @@
     SwapBuffersWithDamage(display_rect_);
 
     EXPECT_EQ(0u, display_output_surface_->num_sent_frames());
     task_runner_->RunUntilIdle();
     EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
   }
 
  protected:
   std::unique_ptr<base::SimpleTestTickClock> now_src_;
   scoped_refptr<OrderedSimpleTaskRunner> task_runner_;
-  SurfaceIdAllocator allocator_;
 
   const gfx::Size display_size_;
   const gfx::Rect display_rect_;
   SurfaceManager surface_manager_;
   TestSharedBitmapManager bitmap_manager_;
   TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
 
   scoped_refptr<TestContextProvider> context_provider_;
   FakeOutputSurface* display_output_surface_ = nullptr;
   std::unique_ptr<Display> display_;
@@ skipping 38 matching lines @@
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
 
   SwapBuffersWithDamage(gfx::Rect());
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
   task_runner_->RunUntilIdle();
   EXPECT_EQ(1u, display_output_surface_->num_sent_frames());
 }
 
 }  // namespace
 }  // namespace cc