mus: Do not create GpuProcessTransportFactory.

GpuProcessTransportFactory should not be created when running with mus.

BUG=none

Change-Id: I888455b68b9fad81d9e7bbb9b16b683df2abd5a5
Reviewed-on: https://chromium-review.googlesource.com/661337Reviewed-by: kylechar <kylechar@chromium.org>
Reviewed-by: Yuri Wiitala <miu@chromium.org>
Reviewed-by: Antoine Labour <piman@chromium.org>
Commit-Queue: Sadrul Chowdhury <sadrul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501438}

content/browser/browser_main_loop.cc

@@ -1446,8 +1446,9 @@ int BrowserMainLoop::BrowserThreadsStarted() {
       memory_instrumentation::mojom::ProcessType::BROWSER);
   memory_instrumentation::ClientProcessImpl::CreateInstance(config);
 
+  const bool is_mus = IsUsingMus();
 #if defined(USE_AURA)
-  if (IsUsingMus()) {
+  if (is_mus) {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kIsRunningInMash);
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
@@ -1485,7 +1486,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {
   established_gpu_channel = true;
   if (!GpuDataManagerImpl::GetInstance()->CanUseGpuBrowserCompositor() ||
       parsed_command_line_.HasSwitch(switches::kDisableGpuEarlyInit) ||
-      IsUsingMus()) {
+      is_mus) {
     established_gpu_channel = always_uses_gpu = false;
   }
   gpu::GpuChannelEstablishFactory* factory =
@@ -1495,7 +1496,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {
     factory = BrowserGpuChannelHostFactory::instance();
   }
 #if !defined(OS_ANDROID)
-  if (!IsUsingMus()) {
+  if (!is_mus) {
     // TODO(kylechar): Remove flag along with surface sequences.
     // See https://crbug.com/676384.
     auto surface_lifetime_type =
@@ -1516,8 +1517,11 @@ int BrowserMainLoop::BrowserThreadsStarted() {
 #endif
 
   DCHECK(factory);
-  ImageTransportFactory::Initialize(GetResizeTaskRunner());
-  ImageTransportFactory::GetInstance()->SetGpuChannelEstablishFactory(factory);
+  if (!is_mus) {
+    ImageTransportFactory::Initialize(GetResizeTaskRunner());
+    ImageTransportFactory::GetInstance()->SetGpuChannelEstablishFactory(
+        factory);
+  }
 #if defined(USE_AURA)
   if (env_->mode() == aura::Env::Mode::LOCAL) {
     env_->set_context_factory(GetContextFactory());
@@ -1619,7 +1623,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {
   // ChildProcess instance which is created by the renderer thread.
   if (GpuDataManagerImpl::GetInstance()->GpuAccessAllowed(NULL) &&
       !established_gpu_channel && always_uses_gpu && !UsingInProcessGpu() &&
-      !IsUsingMus()) {
+      !is_mus) {
     TRACE_EVENT_INSTANT0("gpu", "Post task to launch GPU process",
                          TRACE_EVENT_SCOPE_THREAD);
     BrowserThread::PostTask(

content/browser/media/capture/aura_window_capture_machine.cc

@@ -80,9 +80,6 @@ bool AuraWindowCaptureMachine::InternalStart(
   // Update capture size.
   UpdateCaptureSize();
 
-  // Start observing for GL context losses.
-  ImageTransportFactory::GetInstance()->GetContextFactory()->AddObserver(this);
-
   // Start observing compositor updates.
   aura::WindowTreeHost* const host = desktop_window_->GetHost();
   ui::Compositor* const compositor = host ? host->compositor() : nullptr;
@@ -90,6 +87,9 @@ bool AuraWindowCaptureMachine::InternalStart(
     return false;
   compositor->AddAnimationObserver(this);
 
+  // Start observing for GL context losses.
+  compositor->context_factory()->AddObserver(this);
+
   DCHECK(!wake_lock_);
   // Request Wake Lock. In some testing contexts, the service manager
   // connection isn't initialized.
@@ -159,17 +159,16 @@ void AuraWindowCaptureMachine::InternalStop(const base::Closure& callback) {
   // Stop observing compositor and window events.
   if (desktop_window_) {
     if (aura::WindowTreeHost* host = desktop_window_->GetHost()) {
-      if (ui::Compositor* compositor = host->compositor())
+      if (ui::Compositor* compositor = host->compositor()) {
         compositor->RemoveAnimationObserver(this);
+        compositor->context_factory()->RemoveObserver(this);
+      }
     }
     desktop_window_->RemoveObserver(this);
     desktop_window_ = NULL;
     cursor_renderer_.reset();
   }
 
-  // Stop observing for GL context losses.
-  ImageTransportFactory::GetInstance()->GetContextFactory()->RemoveObserver(
-      this);
   OnLostResources();
 
   callback.Run();
@@ -436,8 +435,10 @@ void AuraWindowCaptureMachine::OnWindowRemovingFromRootWindow(
   DCHECK(window == desktop_window_);
 
   if (aura::WindowTreeHost* host = window->GetHost()) {
-    if (ui::Compositor* compositor = host->compositor())
+    if (ui::Compositor* compositor = host->compositor()) {
       compositor->RemoveAnimationObserver(this);
+      compositor->context_factory()->RemoveObserver(this);
+    }
   }
 }
 
@@ -466,6 +467,7 @@ void AuraWindowCaptureMachine::OnCompositingShuttingDown(
     ui::Compositor* compositor) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   compositor->RemoveAnimationObserver(this);
+  compositor->context_factory()->RemoveObserver(this);
 }
 
 void AuraWindowCaptureMachine::OnLostResources() {

content/browser/renderer_host/render_widget_host_view_aura.cc

@@ -403,7 +403,8 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host,
       is_guest_view_hack_(is_guest_view_hack),
       device_scale_factor_(0.0f),
       event_handler_(new RenderWidgetHostViewEventHandler(host_, this, this)),
-      frame_sink_id_(host_->AllocateFrameSinkId(is_guest_view_hack_)),
+      frame_sink_id_(IsMus() ? viz::FrameSinkId()
+                             : host_->AllocateFrameSinkId(is_guest_view_hack_)),
       weak_ptr_factory_(this) {
   if (!is_guest_view_hack_)
     host_->SetView(this);

content/browser/renderer_host/render_widget_host_view_child_frame.cc

@@ -153,7 +153,7 @@ void RenderWidgetHostViewChildFrame::SetFrameConnectorDelegate(
     RenderWidgetHostViewBase* parent_view =
         frame_connector_->GetParentRenderWidgetHostView();
     if (parent_view) {
-      DCHECK(parent_view->GetFrameSinkId().is_valid());
+      DCHECK(parent_view->GetFrameSinkId().is_valid() || IsUsingMus());
       SetParentFrameSinkId(parent_view->GetFrameSinkId());
     }