Making OutputSurface a begin frame source and vsync source.

cc/test/fake_output_surface_client.h

Index: cc/test/fake_output_surface_client.h
diff --git a/cc/test/fake_output_surface_client.h b/cc/test/fake_output_surface_client.h
index 7ecb6cf2b73c4be47611a0ad4ce20ea893a204f8..433d542fa6e8dbd14b10b84dec7319d79c91a648 100644
--- a/cc/test/fake_output_surface_client.h
+++ b/cc/test/fake_output_surface_client.h
@@ -12,28 +12,16 @@ namespace cc {
 
 class OutputSurface;
 
-class FakeOutputSurfaceClient : public OutputSurfaceClient {
+class FakeOutputSurfaceClient : public OutputSurfaceClient,
+                                public BeginFrameObserver {
  public:
-  FakeOutputSurfaceClient()
-      : output_surface_(NULL),
-        begin_frame_count_(0),
-        deferred_initialize_called_(false),
-        did_lose_output_surface_called_(false),
-        memory_policy_(0) {}
-
-  explicit FakeOutputSurfaceClient(OutputSurface* output_surface)
-      : output_surface_(output_surface),
-        begin_frame_count_(0),
-        deferred_initialize_called_(false),
-        did_lose_output_surface_called_(false),
-        memory_policy_(0) {}
+  FakeOutputSurfaceClient();
+  explicit FakeOutputSurfaceClient(OutputSurface* output_surface);
 
+  // OutputSurfaceClient
   virtual void DeferredInitialize() OVERRIDE;
   virtual void ReleaseGL() OVERRIDE;
-  virtual void CommitVSyncParameters(base::TimeTicks timebase,
-                                     base::TimeDelta interval) OVERRIDE {}
   virtual void SetNeedsRedrawRect(const gfx::Rect& damage_rect) OVERRIDE {}
-  virtual void BeginFrame(const BeginFrameArgs& args) OVERRIDE;
   virtual void DidSwapBuffers() OVERRIDE {}
   virtual void DidSwapBuffersComplete() OVERRIDE {}
   virtual void ReclaimResources(const CompositorFrameAck* ack) OVERRIDE {}
@@ -48,6 +36,13 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient {
   virtual void SetMemoryPolicy(const ManagedMemoryPolicy& policy) OVERRIDE;
   virtual void SetTreeActivationCallback(const base::Closure&) OVERRIDE {}
 
+  // BeginFrameObserver
+  virtual void OnBeginFrame(const BeginFrameArgs& args) OVERRIDE;
+  virtual const BeginFrameArgs& LastBeginFrameArgs() const OVERRIDE;
+
+  // Tracing support
+  virtual void AsValueInto(base::debug::TracedValue* dict) const OVERRIDE;
+
   int begin_frame_count() { return begin_frame_count_; }
 
   bool deferred_initialize_called() {
@@ -63,6 +58,7 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient {
  private:
   OutputSurface* output_surface_;
   int begin_frame_count_;
+  BeginFrameArgs last_begin_frame_args_;
   bool deferred_initialize_called_;
   bool did_lose_output_surface_called_;
   ManagedMemoryPolicy memory_policy_;