Update from https://crrev.com/304121

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 a7620b675c97c3113b15110acbd0b6356e2b41e4..310842da4017eab0bd9ccdc81aab70304c8bcf95 100644
--- a/cc/test/fake_output_surface_client.h
+++ b/cc/test/fake_output_surface_client.h
@@ -16,7 +16,6 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient {
  public:
   FakeOutputSurfaceClient()
       : output_surface_(NULL),
-        begin_frame_count_(0),
         swap_count_(0),
         deferred_initialize_called_(false),
         did_lose_output_surface_called_(false),
@@ -24,7 +23,6 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient {
 
   explicit FakeOutputSurfaceClient(OutputSurface* output_surface)
       : output_surface_(output_surface),
-        begin_frame_count_(0),
         swap_count_(0),
         deferred_initialize_called_(false),
         did_lose_output_surface_called_(false),
@@ -35,7 +33,6 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient {
   void CommitVSyncParameters(base::TimeTicks timebase,
                              base::TimeDelta interval) override {}
   void SetNeedsRedrawRect(const gfx::Rect& damage_rect) override {}
-  void BeginFrame(const BeginFrameArgs& args) override;
   void DidSwapBuffers() override;
   void DidSwapBuffersComplete() override {}
   void ReclaimResources(const CompositorFrameAck* ack) override {}
@@ -50,7 +47,6 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient {
   void SetMemoryPolicy(const ManagedMemoryPolicy& policy) override;
   void SetTreeActivationCallback(const base::Closure&) override {}
 
-  int begin_frame_count() { return begin_frame_count_; }
   int swap_count() { return swap_count_; }
 
   bool deferred_initialize_called() {
@@ -65,7 +61,6 @@ class FakeOutputSurfaceClient : public OutputSurfaceClient {
 
  private:
   OutputSurface* output_surface_;
-  int begin_frame_count_;
   int swap_count_;
   bool deferred_initialize_called_;
   bool did_lose_output_surface_called_;