Hook up BeginFrameSource to SurfaceFactoryClient via SurfaceManager

cc/surfaces/surface_display_output_surface.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_
 #define CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_
 
 #include "base/macros.h"
 #include "cc/output/output_surface.h"
 #include "cc/surfaces/surface_factory.h"
@@ skipping 25 matching lines @@
     display_client_ = display_client;
   }
   SurfaceFactory* factory() { return &factory_; }
   void ReceivedVSyncParameters(base::TimeTicks timebase,
                                base::TimeDelta interval);
 
   // OutputSurface implementation.
   void SwapBuffers(CompositorFrame* frame) override;
   bool BindToClient(OutputSurfaceClient* client) override;
   void ForceReclaimResources() override;
+  void DetachFromClient() override;
 
   // SurfaceFactoryClient implementation.
   void ReturnResources(const ReturnedResourceArray& resources) override;
-  void SetBeginFrameSource(SurfaceId surface_id,
-                           BeginFrameSource* begin_frame_source) override;
+  void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override;
 
  private:
   void SwapBuffersComplete(SurfaceDrawStatus drawn);
 
   OnscreenDisplayClient* display_client_;
   SurfaceFactory factory_;
   gfx::Size display_size_;
   SurfaceId surface_id_;
   SurfaceIdAllocator* allocator_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_