Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

cc/output/compositor_frame_sink.h

 // Copyright 2012 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.
 
 #ifndef CC_OUTPUT_COMPOSITOR_FRAME_SINK_H_
 #define CC_OUTPUT_COMPOSITOR_FRAME_SINK_H_
 
 #include <deque>
 #include <memory>
 
@@ skipping 42 matching lines @@
 
     // Whether ForceReclaimResources can be called to reclaim all resources
     // from the CompositorFrameSink.
     bool can_force_reclaim_resources = false;
     // True if sync points for resources are needed when swapping delegated
     // frames.
     bool delegated_sync_points_required = true;
   };
 
   // Constructor for GL-based and/or software compositing.
-  explicit CompositorFrameSink(
-      scoped_refptr<ContextProvider> context_provider,
-      scoped_refptr<ContextProvider> worker_context_provider);
+  CompositorFrameSink(scoped_refptr<ContextProvider> context_provider,
+                      scoped_refptr<ContextProvider> worker_context_provider);
 
   // Constructor for Vulkan-based compositing.
   explicit CompositorFrameSink(
       scoped_refptr<VulkanContextProvider> vulkan_context_provider);
 
   ~CompositorFrameSink() override;
 
   // Called by the compositor on the compositor thread. This is a place where
   // thread-specific data for the output surface can be initialized, since from
   // this point to when DetachFromClient() is called the output surface will
@@ skipping 62 matching lines @@
   void DetachFromClientInternal();
 
   base::WeakPtrFactory<CompositorFrameSink> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorFrameSink);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_COMPOSITOR_FRAME_SINK_H_