Hook up BeginFrameSource to SurfaceFactoryClient via SurfaceManager

cc/surfaces/surfaces_pixeltest.cc

Index: cc/surfaces/surfaces_pixeltest.cc
diff --git a/cc/surfaces/surfaces_pixeltest.cc b/cc/surfaces/surfaces_pixeltest.cc
index 053a5636ae63bdac6afdcb398db5d344d1729491..405a3d814b61c44624603790ca08a1b716b9d2c6 100644
--- a/cc/surfaces/surfaces_pixeltest.cc
+++ b/cc/surfaces/surfaces_pixeltest.cc
@@ -24,14 +24,7 @@ namespace {
 class EmptySurfaceFactoryClient : public SurfaceFactoryClient {
  public:
   void ReturnResources(const ReturnedResourceArray& resources) override {}
-  void SetBeginFrameSource(SurfaceId surface_id,
-                           BeginFrameSource* begin_frame_source) override {}
-};
-
-class EmptySurfaceAggregatorClient : public SurfaceAggregatorClient {
- public:
-  void AddSurface(Surface* surface) override {}
-  void RemoveSurface(Surface* surface) override {}
+  void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override {}
 };
 
 class SurfacesPixelTest : public RendererPixelTest<GLRenderer> {
@@ -91,9 +84,7 @@ TEST_F(SurfacesPixelTest, DrawSimpleFrame) {
   factory_.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
                                  SurfaceFactory::DrawCallback());
 
-  EmptySurfaceAggregatorClient surface_aggregator_client;
-  SurfaceAggregator aggregator(&surface_aggregator_client, &manager_,
-                               resource_provider_.get(), true);
+  SurfaceAggregator aggregator(&manager_, resource_provider_.get(), true);
   scoped_ptr<CompositorFrame> aggregated_frame =
       aggregator.Aggregate(root_surface_id);
   factory_.Destroy(root_surface_id);
@@ -177,9 +168,7 @@ TEST_F(SurfacesPixelTest, DrawSimpleAggregatedFrame) {
                                    SurfaceFactory::DrawCallback());
   }
 
-  EmptySurfaceAggregatorClient surface_aggregator_client;
-  SurfaceAggregator aggregator(&surface_aggregator_client, &manager_,
-                               resource_provider_.get(), true);
+  SurfaceAggregator aggregator(&manager_, resource_provider_.get(), true);
   scoped_ptr<CompositorFrame> aggregated_frame =
       aggregator.Aggregate(root_surface_id);
 
@@ -322,9 +311,7 @@ TEST_F(SurfacesPixelTest, DrawAggregatedFrameWithSurfaceTransforms) {
                                    SurfaceFactory::DrawCallback());
   }
 
-  EmptySurfaceAggregatorClient surface_aggregator_client;
-  SurfaceAggregator aggregator(&surface_aggregator_client, &manager_,
-                               resource_provider_.get(), true);
+  SurfaceAggregator aggregator(&manager_, resource_provider_.get(), true);
   scoped_ptr<CompositorFrame> aggregated_frame =
       aggregator.Aggregate(root_surface_id);