Move synchronous compositor into content/browser

android_webview/lib/main/aw_main_delegate.cc

Index: android_webview/lib/main/aw_main_delegate.cc
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index e659ce3945d4aa0a9bae15dab1f9073ba1f377e3..30101704a80c191cdb27b902eac790e41f098035 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -5,7 +5,6 @@
 #include "android_webview/lib/main/aw_main_delegate.h"
 
 #include "android_webview/browser/aw_content_browser_client.h"
-#include "android_webview/browser/in_process_renderer/in_process_renderer_client.h"
 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
@@ -19,6 +18,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_restrictions.h"
 #include "cc/base/switches.h"
+#include "content/public/browser/android/synchronous_compositor.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
@@ -60,8 +60,8 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
     cl->AppendSwitch(cc::switches::kEnableCompositorFrameMessage);
     cl->AppendSwitch(switches::kEnableWebViewSynchronousAPIs);
   } else {
-    cl->AppendSwitch(switches::kEnableSynchronousRendererCompositor);
     cl->AppendSwitch(switches::kEnableVsyncNotification);
+    content::SynchronousCompositor::Init();
   }
 
   // WebView uses the existing Android View edge effect for overscroll glow.
@@ -123,14 +123,7 @@ content::ContentBrowserClient*
 
 content::ContentRendererClient*
     AwMainDelegate::CreateContentRendererClient() {
-  // None of this makes sense for multiprocess.
-  DCHECK(CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess));
-  // During transition period allow running in either threading mode; eventually
-  // only the compositor/UI thread merge mode will be supported.
-  const bool no_merge_threads = UIAndRendererCompositorThreadsNotMerged();
-  content_renderer_client_.reset(
-      no_merge_threads ? new AwContentRendererClient() :
-                         new InProcessRendererClient());
+  content_renderer_client_.reset(new AwContentRendererClient());
   return content_renderer_client_.get();
 }