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

content/renderer/mus/renderer_window_tree_client.h

 // Copyright 2017 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.
 
 #ifndef CONTENT_RENDERER_MUS_RENDERER_WINDOW_TREE_CLIENT_H_
 #define CONTENT_RENDERER_MUS_RENDERER_WINDOW_TREE_CLIENT_H_
 
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/common/types.h"
@@ skipping 16 matching lines @@
 
 // ui.mojom.WindowTreeClient implementation for RenderWidget. This lives and
 // operates on the renderer's main thread.
 class RendererWindowTreeClient : public ui::mojom::WindowTreeClient {
  public:
   // Creates a RendererWindowTreeClient instance for the RenderWidget instance
   // associated with |routing_id|. The instance self-destructs when the
   // connection to mus is lost, or when the window is closed.
   static void Create(int routing_id);
 
+  // Destroys the client instance, if one exists. Otherwise, does nothing.
+  static void Destroy(int routing_id);
+
   // Returns the RendererWindowTreeClient associated with |routing_id|. Returns
   // nullptr if none exists.
   static RendererWindowTreeClient* Get(int routing_id);
 
   void Bind(ui::mojom::WindowTreeClientRequest request);
 
   std::unique_ptr<cc::CompositorFrameSink> CreateCompositorFrameSink(
       const cc::FrameSinkId& frame_sink_id,
       scoped_refptr<cc::ContextProvider> context_provider,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager);
@@ skipping 97 matching lines @@
   ui::mojom::WindowTreePtr tree_;
   std::unique_ptr<ui::WindowCompositorFrameSinkBinding> pending_frame_sink_;
   mojo::Binding<ui::mojom::WindowTreeClient> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(RendererWindowTreeClient);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MUS_RENDERER_WINDOW_TREE_CLIENT_H_