Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

cc/surfaces/surfaces_pixeltest.cc

 // Copyright 2014 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/output/compositor_frame.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_aggregator.h"
@@ skipping 14 matching lines @@
 
 class EmptySurfaceFactoryClient : public SurfaceFactoryClient {
  public:
   void ReturnResources(const ReturnedResourceArray& resources) override {}
   void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override {}
 };
 
 class SurfacesPixelTest : public RendererPixelTest<GLRenderer> {
  public:
   SurfacesPixelTest()
-      : allocator_(kArbitraryFrameSinkId), factory_(&manager_, &client_) {}
+      : allocator_(kArbitraryFrameSinkId),
+        factory_(kArbitraryFrameSinkId, &manager_, &client_) {}
 
  protected:
   SurfaceManager manager_;
   SurfaceIdAllocator allocator_;
   EmptySurfaceFactoryClient client_;
   SurfaceFactory factory_;
 };
 
 SharedQuadState* CreateAndAppendTestSharedQuadState(
     RenderPass* render_pass,
@@ skipping 286 matching lines @@
 
   factory_.Destroy(root_surface_id);
   factory_.Destroy(left_child_id);
   factory_.Destroy(right_child_id);
 }
 
 }  // namespace
 }  // namespace cc
 
 #endif  // !defined(OS_ANDROID)