Refactor SynchronousCompositor out of SynchronousCompositorOutputSurface.

content/renderer/render_widget.h

Index: content/renderer/render_widget.h
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index 24fa7f3d14a285160babc686039ec73c6744e6e9..e98962e0ff34268ae0b7e010206dc4c14ebc1b4f 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -74,6 +74,7 @@ namespace content {
 struct GpuRenderingStats;
 class RenderWidgetCompositor;
 class RenderWidgetTest;
+class SynchronousCompositorImpl;
 
 // RenderWidget provides a communication bridge between a WebWidget and
 // a RenderWidgetHost, the latter of which lives in a different process.
@@ -495,6 +496,11 @@ class CONTENT_EXPORT RenderWidget
   WebGraphicsContext3DCommandBufferImpl* CreateGraphicsContext3D(
       const WebKit::WebGraphicsContext3D::Attributes& attributes);
 
+#if defined(OS_ANDROID)
+  // Lazily creates the synchronous compositor on first call.
+  SynchronousCompositorImpl* GetSynchronousCompositor();
+#endif
+
   bool OnSnapshotHelper(const gfx::Rect& src_subrect, SkBitmap* bitmap);
 
   // Routing ID that allows us to communicate to the parent browser process
@@ -509,6 +515,11 @@ class CONTENT_EXPORT RenderWidget
   // This is lazily constructed and must not outlive webwidget_.
   scoped_ptr<RenderWidgetCompositor> compositor_;
 
+#if defined(OS_ANDROID)
+  // This is lazily constructed.
+  scoped_ptr<SynchronousCompositorImpl> synchronous_compositor_;
+#endif
+
   // Set to the ID of the view that initiated creating this view, if any. When
   // the view was initiated by the browser (the common case), this will be
   // MSG_ROUTING_NONE. This is used in determining ownership when opening