Split SurfaceFactoryClient Into Four Interfaces

cc/surfaces/surface_aggregator.cc

Index: cc/surfaces/surface_aggregator.cc
diff --git a/cc/surfaces/surface_aggregator.cc b/cc/surfaces/surface_aggregator.cc
index a5e31ddc480f8a6f040c0b4cb7c8a3ac25e0ce35..5d78365b0b4088439d9b32f080801aeec5cab5cd 100644
--- a/cc/surfaces/surface_aggregator.cc
+++ b/cc/surfaces/surface_aggregator.cc
@@ -26,6 +26,7 @@
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/surfaces/surface.h"
+#include "cc/surfaces/surface_aggregator_client.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/trees/blocking_task_runner.h"
@@ -757,7 +758,7 @@ gfx::Rect SurfaceAggregator::PrewalkTree(const SurfaceId& surface_id,
 
   CHECK(debug_weak_this.get());
   if (surface->factory()) {
-    surface->factory()->WillDrawSurface(
+    surface->factory()->surface_aggregator_client()->WillDrawSurface(
         surface->surface_id().local_surface_id(), damage_rect);
   }