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

content/renderer/render_widget.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_widget.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 371 matching lines @@
   DCHECK(RenderThread::Get());
 
   // In tests there may not be a RenderThreadImpl.
   if (RenderThreadImpl::current()) {
     render_widget_scheduling_state_ = RenderThreadImpl::current()
                                           ->GetRendererScheduler()
                                           ->NewRenderWidgetSchedulingState();
     render_widget_scheduling_state_->SetHidden(is_hidden_);
   }
 #if defined(USE_AURA)
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kUseMusInRenderer)) {
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kNoUseMusInRenderer)) {
     RendererWindowTreeClient::Create(routing_id_);
   }
 #endif
 }
 
 RenderWidget::~RenderWidget() {
   DCHECK(!webwidget_internal_) << "Leaking our WebWidget!";
 
   // If we are swapped out, we have released already.
   if (!is_swapped_out_ && RenderProcess::current())
     RenderProcess::current()->ReleaseProcess();
+#if defined(USE_AURA)
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kNoUseMusInRenderer)) {
+    // It is possible for a RenderWidget to be destroyed before it was embedded
+    // in a mus window. The RendererWindowTreeClient will leak in such cases. So
+    // explicitly delete it here.
+    RendererWindowTreeClient::Destroy(routing_id_);
+  }
+#endif
 }
 
 // static
 void RenderWidget::InstallCreateHook(
     CreateRenderWidgetFunction create_render_widget,
     RenderWidgetInitializedCallback render_widget_initialized) {
   CHECK(!g_create_render_widget && !g_render_widget_initialized);
   g_create_render_widget = create_render_widget;
   g_render_widget_initialized = render_widget_initialized;
 }
@@ skipping 1866 matching lines @@
     // browser side (https://crbug.com/669219).
     // If there is no WebFrameWidget, then there will be no
     // InputMethodControllers for a WebLocalFrame.
     return nullptr;
   }
   return static_cast<blink::WebFrameWidget*>(GetWebWidget())
       ->getActiveWebInputMethodController();
 }
 
 }  // namespace content