[WIP] cc: Plumb SurfaceId from clients

cc/surfaces/surface_aggregator_unittest.cc

Index: cc/surfaces/surface_aggregator_unittest.cc
diff --git a/cc/surfaces/surface_aggregator_unittest.cc b/cc/surfaces/surface_aggregator_unittest.cc
index 804620a35bba4d37149d4a2591b425e6bd3bf139..4520c46d40be6df9bd2198f430ba8b241f4def01 100644
--- a/cc/surfaces/surface_aggregator_unittest.cc
+++ b/cc/surfaces/surface_aggregator_unittest.cc
@@ -68,7 +68,7 @@ class EmptySurfaceFactoryClient : public SurfaceFactoryClient {
 class SurfaceAggregatorTest : public testing::Test {
  public:
   explicit SurfaceAggregatorTest(bool use_damage_rect)
-      : factory_(&manager_, &empty_client_),
+      : factory_(kArbitraryClientId, &manager_, &empty_client_),
         aggregator_(&manager_, NULL, use_damage_rect) {}
 
   SurfaceAggregatorTest() : SurfaceAggregatorTest(false) {}
@@ -1919,7 +1919,7 @@ void SubmitCompositorFrameWithResources(ResourceId* resource_ids,
 
 TEST_F(SurfaceAggregatorWithResourcesTest, TakeResourcesOneSurface) {
   ResourceTrackingSurfaceFactoryClient client;
-  SurfaceFactory factory(&manager_, &client);
+  SurfaceFactory factory(kArbitraryClientId, &manager_, &client);
   SurfaceId surface_id(kArbitraryClientId, 7u, 0);
   factory.Create(surface_id);
 
@@ -1949,7 +1949,7 @@ TEST_F(SurfaceAggregatorWithResourcesTest, TakeResourcesOneSurface) {
 
 TEST_F(SurfaceAggregatorWithResourcesTest, TakeInvalidResources) {
   ResourceTrackingSurfaceFactoryClient client;
-  SurfaceFactory factory(&manager_, &client);
+  SurfaceFactory factory(kArbitraryClientId, &manager_, &client);
   SurfaceId surface_id(kArbitraryClientId, 7u, 0);
   factory.Create(surface_id);
 
@@ -1983,7 +1983,7 @@ TEST_F(SurfaceAggregatorWithResourcesTest, TakeInvalidResources) {
 
 TEST_F(SurfaceAggregatorWithResourcesTest, TwoSurfaces) {
   ResourceTrackingSurfaceFactoryClient client;
-  SurfaceFactory factory(&manager_, &client);
+  SurfaceFactory factory(kArbitraryClientId, &manager_, &client);
   SurfaceId surface1_id(kArbitraryClientId, 7u, 0);
   factory.Create(surface1_id);
 
@@ -2024,7 +2024,7 @@ TEST_F(SurfaceAggregatorWithResourcesTest, TwoSurfaces) {
 // resources.
 TEST_F(SurfaceAggregatorWithResourcesTest, InvalidChildSurface) {
   ResourceTrackingSurfaceFactoryClient client;
-  SurfaceFactory factory(&manager_, &client);
+  SurfaceFactory factory(kArbitraryClientId, &manager_, &client);
   SurfaceId root_surface_id(kArbitraryClientId, 7u, 0);
   factory.Create(root_surface_id);
   SurfaceId middle_surface_id(kArbitraryClientId, 8u, 0);
@@ -2072,7 +2072,7 @@ TEST_F(SurfaceAggregatorWithResourcesTest, InvalidChildSurface) {
 
 TEST_F(SurfaceAggregatorWithResourcesTest, SecureOutputTexture) {
   ResourceTrackingSurfaceFactoryClient client;
-  SurfaceFactory factory(&manager_, &client);
+  SurfaceFactory factory(kArbitraryClientId, &manager_, &client);
   SurfaceId surface1_id(kArbitraryClientId, 7u, 0);
   factory.Create(surface1_id);