Replace merge-ui-and-compositor-threads flag with no-merge-ui-and-compositor-threads flag

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 74bfb52b7c0e4c47bf576c519f1fa0524e6e082e..e94600feeb86f58e29e55f0fcabba9488bb9f4e5 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -76,13 +76,13 @@ content::ContentBrowserClient*
 }
 
 namespace {
-bool UIAndRendererCompositorThreadsMerged() {
+bool UIAndRendererCompositorThreadsNotMerged() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kMergeUIAndRendererCompositorThreads);
+      switches::kNoMergeUIAndRendererCompositorThreads);
 }
 
 MessageLoop* GetRendererCompositorThreadOverrideLoop() {
-  if (!UIAndRendererCompositorThreadsMerged())
+  if (UIAndRendererCompositorThreadsNotMerged())
     return NULL;
 
   MessageLoop* rv = content::BrowserThread::UnsafeGetMessageLoopForThread(
@@ -98,7 +98,7 @@ content::ContentRendererClient*
   // when UI and compositor threads are merged, so we disable client compositor
   // input handling in this case.
   const bool enable_client_compositor_input_handling =
-      !UIAndRendererCompositorThreadsMerged();
+      UIAndRendererCompositorThreadsNotMerged();
   content_renderer_client_.reset(
       new AwContentRendererClient(&GetRendererCompositorThreadOverrideLoop,
                                   enable_client_compositor_input_handling));