Move SynchronousCompositor 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 19a035d4e2e7f14196da9a5bdb54dd713c178e16..6a166cd481195d80eef1b5a1b869654f1c024c11 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -62,7 +62,7 @@
 #include "webkit/renderer/compositor_bindings/web_rendering_stats_impl.h"
 
 #if defined(OS_ANDROID)
-#include "content/renderer/android/synchronous_compositor_output_surface.h"
+#include "content/renderer/android/synchronous_compositor_factory.h"
 #endif
 
 #if defined(OS_POSIX)
@@ -305,10 +305,7 @@ bool RenderWidget::AllowPartialSwap() const {
 
 bool RenderWidget::UsingSynchronousRendererCompositor() const {
 #if defined(OS_ANDROID)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableSynchronousRendererCompositor)) {
-    return true;
-  }
+  return SynchronousCompositorFactory::HasInstance();
 #endif
   return false;
 }
@@ -585,9 +582,9 @@ scoped_ptr<cc::OutputSurface> RenderWidget::CreateOutputSurface() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
 #if defined(OS_ANDROID)
-  if (command_line.HasSwitch(switches::kEnableSynchronousRendererCompositor)) {
-    return scoped_ptr<cc::OutputSurface>(
-        new SynchronousCompositorOutputSurface(routing_id()));
+  if (SynchronousCompositorFactory::HasInstance()) {
+    return SynchronousCompositorFactory::GetInstance()->CreateOutputSurface(
+        routing_id());
   }
 #endif