Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

ui/compositor/compositor_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 <stdint.h>
 
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/output/begin_frame_args.h"
@@ skipping 15 matching lines @@
 namespace ui {
 namespace {
 
 class FakeCompositorFrameSink : public cc::SurfaceFactoryClient {
  public:
   FakeCompositorFrameSink(const cc::FrameSinkId& frame_sink_id,
                           cc::SurfaceManager* manager)
       : frame_sink_id_(frame_sink_id),
         manager_(manager),
         source_(nullptr),
-        factory_(manager, this) {
+        factory_(frame_sink_id, manager, this) {
     manager_->RegisterFrameSinkId(frame_sink_id_);
     manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
   }
 
   ~FakeCompositorFrameSink() override {
     manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
     manager_->InvalidateFrameSinkId(frame_sink_id_);
   }
 
   void ReturnResources(const cc::ReturnedResourceArray& resources) override {}
@@ skipping 102 matching lines @@
   EXPECT_EQ(gfx::kNullAcceleratedWidget,
             compositor()->ReleaseAcceleratedWidget());
   compositor()->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
   compositor()->SetVisible(true);
   compositor()->ScheduleDraw();
   DrawWaiterForTest::WaitForCompositingEnded(compositor());
   compositor()->SetRootLayer(nullptr);
 }
 
 }  // namespace ui