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

android_webview/browser/renderer_host/view_renderer_host.cc

 // Copyright (c) 2013 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/browser/renderer_host/view_renderer_host.h"
 
 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/common/render_view_messages.h"
 #include "android_webview/common/renderer_picture_map.h"
@@ skipping 30 matching lines @@
 }
 
 void ViewRendererHost::OnPictureUpdated() {
   client_->OnPictureUpdated(web_contents()->GetRenderProcessHost()->GetID(),
                             routing_id());
 }
 
 void ViewRendererHost::OnDidActivateAcceleratedCompositing(
     int input_handler_id) {
 
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kMergeUIAndRendererCompositorThreads)) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kNoMergeUIAndRendererCompositorThreads)) {
     return;
   }
 
   // This call is only meaningful and thread-safe when the UI and renderer
   // compositor share the same thread.  Any other case will likely yield
   // terrible, terrible damage.
   WebKit::WebCompositorInputHandler* input_handler =
       WebKit::WebCompositorInputHandler::fromIdentifier(input_handler_id);
   if (!input_handler)
     return;
@@ skipping 32 matching lines @@
   return handled ? true : WebContentsObserver::OnMessageReceived(message);
 }
 
 bool ViewRendererHost::IsRenderViewReady() const {
   return web_contents()->GetRenderProcessHost()->HasConnection() &&
       web_contents()->GetRenderViewHost() &&
       web_contents()->GetRenderViewHost()->IsRenderViewLive();
 }
 
 }  // namespace android_webview