Fix false dependency on mus, tracing and mojo_runner

We do not need these just because we use most of Aura.

Change-Id: I49f7894bcc6b18b8719ebf59927154730f9e54d2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

8 files changed, 39 insertions, 9 deletions

diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn
index a4b1faaba9d..ea10d9bda55 100644
--- a/chromium/content/browser/BUILD.gn
+++ b/chromium/content/browser/BUILD.gn
@@ -1864,7 +1864,7 @@ source_set("browser") {
     deps += [ "//media/mojo/interfaces" ]
   }
 
-  if (use_aura) {
+  if (use_aura && !use_qt) {
     deps += [
       "//services/ui/public/cpp",
       "//services/ui/public/interfaces",
@@ -1881,7 +1881,7 @@ source_set("browser") {
       "renderer_host/render_widget_host_view_event_handler.cc",
       "renderer_host/render_widget_host_view_event_handler.h",
     ]
-  } else {  # Not aura.
+  } else if (!use_aura) {  # Not aura.
     sources -= [
       "renderer_host/compositor_resize_lock_aura.cc",
       "renderer_host/compositor_resize_lock_aura.h",
diff --git a/chromium/content/browser/compositor/gpu_process_transport_factory.cc b/chromium/content/browser/compositor/gpu_process_transport_factory.cc
index aab05cda781..3edcb42e359 100644
--- a/chromium/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/chromium/content/browser/compositor/gpu_process_transport_factory.cc
@@ -549,7 +549,7 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
           gpu_vsync_control = gpu_output_surface.get();
           display_output_surface = std::move(gpu_output_surface);
         } else {
-#if defined(USE_AURA)
+#if defined(USE_AURA) && !defined(TOOLKIT_QT)
           aura::WindowTreeHost* host =
               aura::WindowTreeHost::GetForAcceleratedWidget(
                   compositor->widget());
diff --git a/chromium/content/renderer/BUILD.gn b/chromium/content/renderer/BUILD.gn
index 8852de8a1e2..ea54ef6fe74 100644
--- a/chromium/content/renderer/BUILD.gn
+++ b/chromium/content/renderer/BUILD.gn
@@ -491,7 +491,7 @@ target(link_target_type, "renderer") {
   ]
   allow_circular_includes_from = []
 
-  if (use_aura) {
+  if (use_aura && !use_qt) {
     public_deps += [ "//content/renderer/mus" ]
     allow_circular_includes_from += [ "//content/renderer/mus" ]
     deps += [ "//services/ui/public/cpp" ]
diff --git a/chromium/content/renderer/render_thread_impl.cc b/chromium/content/renderer/render_thread_impl.cc
index 02a6627cb64..eb907a4025a 100644
--- a/chromium/content/renderer/render_thread_impl.cc
+++ b/chromium/content/renderer/render_thread_impl.cc
@@ -197,9 +197,11 @@
 #include "v8/src/third_party/vtune/v8-vtune.h"
 #endif
 
+#if !defined(TOOLKIT_QT)
 #include "content/public/common/service_manager_connection.h"
 #include "content/renderer/mus/render_widget_window_tree_client_factory.h"
 #include "content/renderer/mus/renderer_window_tree_client.h"
+#endif
 #include "services/ui/public/cpp/gpu/gpu.h"
 
 #if defined(ENABLE_IPC_FUZZER)
@@ -622,12 +624,16 @@ void RenderThreadImpl::Init(
   // Register this object as the main thread.
   ChildProcess::current()->set_main_thread(this);
 
+#if !defined(TOOLKIT_QT)
   if (IsRunningInMash()) {
     gpu_ = ui::Gpu::Create(GetServiceManagerConnection()->GetConnector(),
                            GetIOTaskRunner());
   } else {
     gpu_ = ui::Gpu::Create(GetRemoteInterfaces(), GetIOTaskRunner());
   }
+#else
+  gpu_ = ui::Gpu::Create(GetRemoteInterfaces(), GetIOTaskRunner());
+#endif
 
   channel()->GetThreadSafeRemoteAssociatedInterface(
       &thread_safe_render_message_filter_);
@@ -701,7 +707,7 @@ void RenderThreadImpl::Init(
 
   AddFilter((new ServiceWorkerContextMessageFilter())->GetFilter());
 
-#if defined(USE_AURA)
+#if defined(USE_AURA) && !defined(TOOLKIT_QT)
   if (IsRunningInMash() &&
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kNoUseMusInRenderer)) {
@@ -843,7 +849,7 @@ void RenderThreadImpl::Init(
 
   discardable_memory::mojom::DiscardableSharedMemoryManagerPtr manager_ptr;
   if (IsRunningInMash()) {
-#if defined(USE_AURA)
+#if defined(USE_AURA) && !defined(TOOLKIT_QT)
     GetServiceManagerConnection()->GetConnector()->BindInterface(
         ui::mojom::kServiceName, &manager_ptr);
 #else
@@ -1852,7 +1858,7 @@ RenderThreadImpl::CreateCompositorFrameSink(
   if (command_line.HasSwitch(switches::kDisableGpuCompositing))
     use_software = true;
 
-#if defined(USE_AURA)
+#if defined(USE_AURA) && !defined(TOOLKIT_QT)
   if (!use_software && IsRunningInMash() &&
       !command_line.HasSwitch(switches::kNoUseMusInRenderer)) {
     return RendererWindowTreeClient::Get(routing_id)
diff --git a/chromium/content/renderer/render_widget.cc b/chromium/content/renderer/render_widget.cc
index 6a4442fa9cb..e0ae75e2ad4 100644
--- a/chromium/content/renderer/render_widget.cc
+++ b/chromium/content/renderer/render_widget.cc
@@ -392,7 +392,7 @@ RenderWidget::RenderWidget(int32_t widget_routing_id,
                                           ->NewRenderWidgetSchedulingState();
     render_widget_scheduling_state_->SetHidden(is_hidden_);
   }
-#if defined(USE_AURA)
+#if defined(USE_AURA) && !defined(TOOLKIT_QT)
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kNoUseMusInRenderer)) {
     RendererWindowTreeClient::CreateIfNecessary(routing_id_);
@@ -406,7 +406,7 @@ RenderWidget::~RenderWidget() {
   // If we are swapped out, we have released already.
   if (!is_swapped_out_ && RenderProcess::current())
     RenderProcess::current()->ReleaseProcess();
-#if defined(USE_AURA)
+#if defined(USE_AURA) && !defined(TOOLKIT_QT)
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kNoUseMusInRenderer)) {
     // It is possible for a RenderWidget to be destroyed before it was embedded
diff --git a/chromium/services/ui/clipboard/BUILD.gn b/chromium/services/ui/clipboard/BUILD.gn
index 758c303e261..a79e9c2476d 100644
--- a/chromium/services/ui/clipboard/BUILD.gn
+++ b/chromium/services/ui/clipboard/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/features.gni")
 import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
@@ -50,6 +51,11 @@ service_test("mus_clipboard_unittests") {
     ":lib",
     "//services/ui",
   ]
+  if (use_qt) {
+    data_deps -= [
+      "//services/ui",
+    ]
+  }
 }
 
 service_manifest("test_manifest") {
diff --git a/chromium/services/ui/public/cpp/BUILD.gn b/chromium/services/ui/public/cpp/BUILD.gn
index 0d050272952..c572651b133 100644
--- a/chromium/services/ui/public/cpp/BUILD.gn
+++ b/chromium/services/ui/public/cpp/BUILD.gn
@@ -40,6 +40,12 @@ source_set("cpp") {
     "//services/ui",
   ]
 
+  if (use_qt) {
+    data_deps -= [
+      "//services/ui",
+    ]
+  }
+
   defines = [ "GL_GLEXT_PROTOTYPES" ]
 
   allow_circular_includes_from = [ ":internal" ]
@@ -80,6 +86,12 @@ source_set("internal") {
     "//services/ui",
   ]
 
+  if (use_qt) {
+    data_deps -= [
+      "//services/ui",
+    ]
+  }
+
   defines = [ "GL_GLEXT_PROTOTYPES" ]
 
   if (use_ozone) {
diff --git a/chromium/ui/aura/BUILD.gn b/chromium/ui/aura/BUILD.gn
index 15e97936f7c..d1d86ffe3fc 100644
--- a/chromium/ui/aura/BUILD.gn
+++ b/chromium/ui/aura/BUILD.gn
@@ -176,6 +176,12 @@ component("aura") {
     "//services/ui",
   ]
 
+  if (use_qt) {
+    data_deps -= [
+      "//services/ui",
+    ]
+  }
+
   if (use_x11) {
     configs += [
       "//build/config/linux:x11",