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

content/renderer/mus/render_widget_mus_connection.cc

 // Copyright 2015 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/mus/render_widget_mus_connection.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
@@ skipping 28 matching lines @@
   if (window_surface_binding_) {
     compositor_mus_connection_->AttachSurfaceOnMainThread(
         std::move(window_surface_binding_));
   }
 }
 
 std::unique_ptr<cc::OutputSurface>
 RenderWidgetMusConnection::CreateOutputSurface() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!window_surface_binding_);
-  scoped_refptr<cc::ContextProvider> context_provider(new ui::ContextProvider(
-      MojoShellConnection::GetForProcess()->GetConnector()));
+  auto* connector =

[Ken Rockot(use gerrit already), 2016/07/13 18:29:02]

nit: why add the local?

[Peng, 2016/07/13 19:00:36]

Just copy those two lines from somewhere else, so ...

Changed it back.

+      ChildThread::Get()->GetMojoShellConnection()->GetConnector();
+  scoped_refptr<cc::ContextProvider> context_provider(
+      new ui::ContextProvider(connector));
 
   std::unique_ptr<cc::OutputSurface> surface(new ui::OutputSurface(
       context_provider, ui::WindowSurface::Create(&window_surface_binding_)));
   if (compositor_mus_connection_) {
     compositor_mus_connection_->AttachSurfaceOnMainThread(
         std::move(window_surface_binding_));
   }
   return surface;
 }
 
@@ skipping 110 matching lines @@
   // previous event.
   // DCHECK(pending_ack_.is_null());
   pending_ack_ = ack;
   // TODO(fsamuel, sadrul): Track real latency info.
   ui::LatencyInfo latency_info;
   input_handler_->HandleInputEvent(*input_event, latency_info,
                                    DISPATCH_TYPE_BLOCKING);
 }
 
 }  // namespace content