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

android_webview/browser/browser_view_renderer_impl.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/browser_view_renderer_impl.h"
 
 #include <android/bitmap.h>
 
 #include "android_webview/browser/in_process_renderer/in_process_view_renderer.h"
 #include "android_webview/common/aw_switches.h"
@@ skipping 104 matching lines @@
 
  private:
   BrowserViewRendererImpl* instance_;
 };
 
 // static
 BrowserViewRendererImpl* BrowserViewRendererImpl::Create(
     BrowserViewRenderer::Client* client,
     JavaHelper* java_helper) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kMergeUIAndRendererCompositorThreads)) {
-    return new InProcessViewRenderer(client, java_helper);
+      switches::kNoMergeUIAndRendererCompositorThreads)) {
+    return new BrowserViewRendererImpl(client, java_helper);
   }
 
-  return new BrowserViewRendererImpl(client, java_helper);
+  return new InProcessViewRenderer(client, java_helper);
 }
 
 // static
 BrowserViewRendererImpl* BrowserViewRendererImpl::FromWebContents(
     content::WebContents* contents) {
   return UserData::GetInstance(contents);
 }
 
 // static
 BrowserViewRendererImpl* BrowserViewRendererImpl::FromId(int render_process_id,
@@ skipping 410 matching lines @@
 
 void BrowserViewRendererImpl::OnFrameInfoUpdated(
     const gfx::SizeF& content_size,
     const gfx::Vector2dF& scroll_offset,
     float page_scale_factor) {
   page_scale_ = page_scale_factor;
   content_size_css_ = content_size;
 }
 
 }  // namespace android_webview