Move synchronous compositor into content/browser

content/renderer/render_widget.cc

Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 6082fd9656fb6094ae0db3391f40181af89858d8..2930a966c740ea5d15afa1ee7d9a27c2b3bbbcd5 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -62,8 +62,7 @@
 #include "webkit/renderer/compositor_bindings/web_rendering_stats_impl.h"
 
 #if defined(OS_ANDROID)
-#include "content/renderer/android/synchronous_compositor_impl.h"
-#include "content/renderer/android/synchronous_compositor_output_surface.h"
+#include "content/renderer/android/synchronous_compositor_factory.h"
 #endif
 
 #if defined(OS_POSIX)
@@ -306,12 +305,10 @@ bool RenderWidget::AllowPartialSwap() const {
 
 bool RenderWidget::UsingSynchronousRendererCompositor() const {
 #if defined(OS_ANDROID)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableSynchronousRendererCompositor)) {
-    return true;
-  }
-#endif
+  return SynchronousCompositorFactory::HasInstance();
+#else
   return false;
+#endif
 }
 
 bool RenderWidget::OnMessageReceived(const IPC::Message& message) {
@@ -586,8 +583,9 @@ scoped_ptr<cc::OutputSurface> RenderWidget::CreateOutputSurface() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
 #if defined(OS_ANDROID)
-  if (GetSynchronousCompositor()) {
-    return GetSynchronousCompositor()->CreateOutputSurface();
+   if (SynchronousCompositorFactory::HasInstance()) {
+    return SynchronousCompositorFactory::GetInstance()->CreateOutputSurface(
+        routing_id());
   }
 #endif
 
@@ -630,17 +628,6 @@ scoped_ptr<cc::OutputSurface> RenderWidget::CreateOutputSurface() {
           new CompositorOutputSurface(routing_id(), context, NULL));
 }
 
-#if defined(OS_ANDROID)
-SynchronousCompositorImpl* RenderWidget::GetSynchronousCompositor() {
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (!synchronous_compositor_ &&
-      command_line.HasSwitch(switches::kEnableSynchronousRendererCompositor)) {
-    synchronous_compositor_.reset(new SynchronousCompositorImpl(routing_id()));
-  }
-  return synchronous_compositor_.get();
-}
-#endif
-
 void RenderWidget::OnViewContextSwapBuffersAborted() {
   TRACE_EVENT0("renderer", "RenderWidget::OnSwapBuffersAborted");
   while (!updates_pending_swap_.empty()) {