Hook up BeginFrameSource to SurfaceFactoryClient via SurfaceManager

components/mus/ws/server_window_surface.h

Index: components/mus/ws/server_window_surface.h
diff --git a/components/mus/ws/server_window_surface.h b/components/mus/ws/server_window_surface.h
index 378c09d769ef02826ad97865fea298786048c20d..f6197a64265ef99c3d4440fa48e280e5c5a13bb4 100644
--- a/components/mus/ws/server_window_surface.h
+++ b/components/mus/ws/server_window_surface.h
@@ -59,6 +59,9 @@ class ServerWindowSurface : public mojom::Surface,
   // Destroys old surfaces that have been outdated by a new surface.
   void DestroySurfacesScheduledForDestruction();
 
+  // Registers this with the SurfaceManager
+  void RegisterForBeginFrames();
+
  private:
   ServerWindow* window();
 
@@ -78,8 +81,7 @@ class ServerWindowSurface : public mojom::Surface,
 
   // SurfaceFactoryClient implementation.
   void ReturnResources(const cc::ReturnedResourceArray& resources) override;
-  void SetBeginFrameSource(cc::SurfaceId surface_id,
-                           cc::BeginFrameSource* begin_frame_source) override;
+  void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
 
   ServerWindowSurfaceManager* manager_;  // Owns this.
 
@@ -98,6 +100,8 @@ class ServerWindowSurface : public mojom::Surface,
   // Set of surface ids that need to be destroyed.
   std::set<cc::SurfaceId> surfaces_scheduled_for_destruction_;
 
+  bool registered_surface_factory_client_;
+
   DISALLOW_COPY_AND_ASSIGN(ServerWindowSurface);
 };