Fix --use-mus-in-renderer for mus+ash

content/renderer/mus/render_widget_window_tree_client_factory.cc

Index: content/renderer/mus/render_widget_window_tree_client_factory.cc
diff --git a/content/renderer/mus/render_widget_window_tree_client_factory.cc b/content/renderer/mus/render_widget_window_tree_client_factory.cc
index ef56edd1be5ddd10bc8fa4a5665ac2064db50596..5abfc23f4c02e40bed6e8a29b965f1eb065e531b 100644
--- a/content/renderer/mus/render_widget_window_tree_client_factory.cc
+++ b/content/renderer/mus/render_widget_window_tree_client_factory.cc
@@ -10,6 +10,7 @@
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "content/common/render_widget_window_tree_client_factory.mojom.h"
+#include "content/public/child/child_thread.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "content/renderer/mus/render_widget_mus_connection.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
@@ -32,7 +33,7 @@ class RenderWidgetWindowTreeClientFactoryImpl
       public mojom::RenderWidgetWindowTreeClientFactory {
  public:
   RenderWidgetWindowTreeClientFactoryImpl() {
-    DCHECK(MojoShellConnection::GetForProcess());
+    DCHECK(ChildThread::Get()->GetMojoShellConnection());

[Fady Samuel, 2016/07/13 14:48:47]

I'd get rockot@ to review these changes.

[Peng, 2016/07/13 15:01:13]

Sure.

   }
 
   ~RenderWidgetWindowTreeClientFactoryImpl() override {}
@@ -68,7 +69,7 @@ class RenderWidgetWindowTreeClientFactoryImpl
 }  // namespace
 
 void CreateRenderWidgetWindowTreeClientFactory() {
-  MojoShellConnection::GetForProcess()->MergeService(
+  ChildThread::Get()->GetMojoShellConnection()->MergeService(
       base::WrapUnique(new RenderWidgetWindowTreeClientFactoryImpl));
 }