mus: Make --use-mus-in-renderer the default for --mash.

content/renderer/render_thread_impl.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 "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <utility>
@@ skipping 688 matching lines @@
   AddFilter(audio_message_filter_.get());
 
   midi_message_filter_ = new MidiMessageFilter(GetIOTaskRunner());
   AddFilter(midi_message_filter_.get());
 
   AddFilter((new CacheStorageMessageFilter(thread_safe_sender()))->GetFilter());
 
   AddFilter((new ServiceWorkerContextMessageFilter())->GetFilter());
 
 #if defined(USE_AURA)
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kUseMusInRenderer)) {
+  if (IsRunningInMash() &&
+      !base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kNoUseMusInRenderer)) {
     CreateRenderWidgetWindowTreeClientFactory(GetServiceManagerConnection());
   }
 #endif
 
   // Must be called before RenderThreadStarted() below.
   StartServiceManagerConnection();
 
   GetContentClient()->renderer()->RenderThreadStarted();
 
   GetAssociatedInterfaceRegistry()->AddInterface(
@@ skipping 1166 matching lines @@
     bool use_software,
     int routing_id,
     scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue,
     const GURL& url) {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kDisableGpuCompositing))
     use_software = true;
 
 #if defined(USE_AURA)
-  if (!use_software && command_line.HasSwitch(switches::kUseMusInRenderer)) {
+  if (!use_software && IsRunningInMash() &&
+      !command_line.HasSwitch(switches::kNoUseMusInRenderer)) {
     return RendererWindowTreeClient::Get(routing_id)
         ->CreateCompositorFrameSink(
             frame_sink_id,
             gpu_->CreateContextProvider(EstablishGpuChannelSync()),
             GetGpuMemoryBufferManager());
   }
 #endif
 
   uint32_t compositor_frame_sink_id = g_next_compositor_frame_sink_id++;
 
@@ skipping 530 matching lines @@
   }
 }
 
 void RenderThreadImpl::OnRendererInterfaceRequest(
     mojom::RendererAssociatedRequest request) {
   DCHECK(!renderer_binding_.is_bound());
   renderer_binding_.Bind(std::move(request));
 }
 
 }  // namespace content