cc: Use BeginFrameArgs

cc/output/output_surface.h

Index: cc/output/output_surface.h
diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
index a94d41efd7370896c3130ecd42ee160e3e86a545..b06272b034a2c215f642126ac18cbee6ee2f53b3 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -159,6 +159,10 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
   bool needs_begin_frame_;
   bool begin_frame_pending_;
 
+  // This stores a BeginFrame that we couldn't process immediately, but might
+  // process retroactively in the near future.
+  BeginFrameArgs skipped_begin_frame_args_;
+
   // Forwarded to OutputSurfaceClient but threaded through OutputSurface
   // first so OutputSurface has a chance to update the FrameRateController
   void SetNeedsRedrawRect(gfx::Rect damage_rect);
@@ -171,7 +175,7 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
                                   gfx::Rect viewport);
 
   // virtual for testing.
-  virtual base::TimeDelta AlternateRetroactiveBeginFramePeriod();
+  virtual base::TimeTicks RetroactiveBeginFrameDeadline();
   virtual void PostCheckForRetroactiveBeginFrame();
   void CheckForRetroactiveBeginFrame();
 
@@ -184,10 +188,6 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
   void SetMemoryPolicy(const ManagedMemoryPolicy& policy,
                        bool discard_backbuffer_when_not_visible);
 
-  // This stores a BeginFrame that we couldn't process immediately, but might
-  // process retroactively in the near future.
-  BeginFrameArgs skipped_begin_frame_args_;
-
   // check_for_retroactive_begin_frame_pending_ is used to avoid posting
   // redundant checks for a retroactive BeginFrame.
   bool check_for_retroactive_begin_frame_pending_;