Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

cc/surfaces/surface_aggregator_perftest.cc

Index: cc/surfaces/surface_aggregator_perftest.cc
diff --git a/cc/surfaces/surface_aggregator_perftest.cc b/cc/surfaces/surface_aggregator_perftest.cc
index 2017cec28d3da8c2d5c70e9558a30ee39f739688..30cbdff4c6f1ac72c3b8d08332b7afaaac48b2e2 100644
--- a/cc/surfaces/surface_aggregator_perftest.cc
+++ b/cc/surfaces/surface_aggregator_perftest.cc
@@ -32,7 +32,8 @@ class EmptySurfaceFactoryClient : public SurfaceFactoryClient {
 
 class SurfaceAggregatorPerfTest : public testing::Test {
  public:
-  SurfaceAggregatorPerfTest() : factory_(&manager_, &empty_client_) {
+  SurfaceAggregatorPerfTest()
+      : factory_(kArbitraryFrameSinkId, &manager_, &empty_client_) {
     context_provider_ = TestContextProvider::Create();
     context_provider_->BindToCurrentThread();
     shared_bitmap_manager_.reset(new TestSharedBitmapManager);