Revert 206020 "cc: Emulate BeginFrame in OutputSurfaces that don..."

trunk/src/cc/test/fake_output_surface.h

Index: trunk/src/cc/test/fake_output_surface.h
===================================================================
--- trunk/src/cc/test/fake_output_surface.h	(revision 206654)
+++ trunk/src/cc/test/fake_output_surface.h	(working copy)
@@ -74,6 +74,7 @@
   bool needs_begin_frame() const {
     return needs_begin_frame_;
   }
+  void BeginFrame(base::TimeTicks frame_time);
 
   void set_forced_draw_to_software_device(bool forced) {
     forced_draw_to_software_device_ = forced;
@@ -94,13 +95,10 @@
       scoped_ptr<SoftwareOutputDevice> software_device,
       bool delegated_rendering);
 
-  void OnBeginFrame();
-
   CompositorFrame last_sent_frame_;
   size_t num_sent_frames_;
   bool needs_begin_frame_;
   bool forced_draw_to_software_device_;
-  base::WeakPtrFactory<FakeOutputSurface> fake_weak_ptr_factory_;
 };
 
 static inline scoped_ptr<cc::OutputSurface> CreateFakeOutputSurface() {