Unified OutputSurface::SwapBuffers.

cc/test/fake_output_surface.h

Index: cc/test/fake_output_surface.h
diff --git a/cc/test/fake_output_surface.h b/cc/test/fake_output_surface.h
index 7460f93b1baa29baa6bbf5cab9251c820ce239bc..fc735080b87941cd7c7a9a47d938647855226af4 100644
--- a/cc/test/fake_output_surface.h
+++ b/cc/test/fake_output_surface.h
@@ -66,11 +66,11 @@ class FakeOutputSurface : public OutputSurface {
     return result.Pass();
   }
 
-  virtual void SendFrameToParentCompositor(CompositorFrame* frame) OVERRIDE;
-
   CompositorFrame& last_sent_frame() { return last_sent_frame_; }
   size_t num_sent_frames() { return num_sent_frames_; }
 
+  virtual void SwapBuffers(CompositorFrame* frame) OVERRIDE;
+
   virtual void SetNeedsBeginFrame(bool enable) OVERRIDE;
   bool needs_begin_frame() const {
     return needs_begin_frame_;
@@ -85,16 +85,16 @@ class FakeOutputSurface : public OutputSurface {
  protected:
   FakeOutputSurface(
       scoped_ptr<WebKit::WebGraphicsContext3D> context3d,
-      bool has_parent);
+      bool delegated_rendering);
 
   FakeOutputSurface(
       scoped_ptr<SoftwareOutputDevice> software_device,
-      bool has_parent);
+      bool delegated_rendering);
 
   FakeOutputSurface(
       scoped_ptr<WebKit::WebGraphicsContext3D> context3d,
       scoped_ptr<SoftwareOutputDevice> software_device,
-      bool has_parent);
+      bool delegated_rendering);
 
   void SendFrameAck();