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

android_webview/lib/main/aw_main_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/lib/main/aw_main_delegate.h"
 
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/lib/aw_browser_dependency_factory_impl.h"
 #include "android_webview/native/aw_geolocation_permission_context.h"
@@ skipping 58 matching lines @@
   logging::CloseLogFile();
 }
 
 content::ContentBrowserClient*
     AwMainDelegate::CreateContentBrowserClient() {
   content_browser_client_.reset(new AwContentBrowserClient(this));
   return content_browser_client_.get();
 }
 
 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(
       content::BrowserThread::UI);
   DCHECK(rv);
   return rv;
 }
 }
 
 content::ContentRendererClient*
     AwMainDelegate::CreateContentRendererClient() {
   // Compositor input handling will be performed by the renderer host
   // 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));
   return content_renderer_client_.get();
 }
 
 AwQuotaManagerBridge* AwMainDelegate::CreateAwQuotaManagerBridge(
     AwBrowserContext* browser_context) {
   return new AwQuotaManagerBridgeImpl(browser_context);
 }
 
 content::GeolocationPermissionContext*
     AwMainDelegate::CreateGeolocationPermission(
         AwBrowserContext* browser_context) {
   return AwGeolocationPermissionContext::Create(browser_context);
 }
 
 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate(
     content::WebContents* web_contents) {
   return AwWebContentsViewDelegate::Create(web_contents);
 }
 
 }  // namespace android_webview