Remove various test and telemetry dependencies

This allows removing the catapult dependency

Change-Id: Ia2bf777b07e9f88e28d6637bf3aab5d6a97ca7e6
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

9 files changed, 80 insertions, 97 deletions

diff --git a/chromium/BUILD.gn b/chromium/BUILD.gn
index 4016d0415ad..544eff7e7ec 100644
--- a/chromium/BUILD.gn
+++ b/chromium/BUILD.gn
@@ -156,6 +156,14 @@ group("gn_all") {
       "//ui/accessibility:accessibility_unittests",
       "//ui/accessibility/extensions",
     ]
+    if (use_qt) {
+      deps -= [
+        "//chrome/test:browser_tests",
+        "//chrome/test:interactive_ui_tests",
+        "//chrome/test:sync_integration_tests",
+        "//chrome/test/chromedriver:chromedriver_unittests",
+      ]
+    }
   }
 
   if (!is_ios) {
@@ -224,6 +232,13 @@ group("gn_all") {
       "//url/ipc:url_ipc_unittests",
       "//v8:gn_all",
     ]
+    if (use_qt) {
+      deps -= [
+        "//chrome/test:telemetry_perf_unittests",
+        "//chrome/test:unit_tests",
+        "//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
+      ]
+    }
   } else if (is_ios) {
     deps += [ "//ios:all" ]
   } else if (is_fuchsia) {
@@ -486,6 +501,14 @@ group("gn_all") {
         "//third_party/leveldatabase:env_chromium_unittests",
         "//third_party/libaddressinput:libaddressinput_unittests",
       ]
+      if (use_qt) {
+        deps -= [
+          "//chrome/test:load_library_perf_tests",
+          "//chrome/test:sync_performance_tests",
+          "//chrome/test/chromedriver:chromedriver",
+          "//chrome/test/chromedriver:chromedriver_tests",
+        ]
+      }
     }
 
     if (enable_extensions) {
@@ -688,6 +711,9 @@ group("gn_all") {
     if (target_cpu == "x86" || target_cpu == "x64") {
       if (!is_android) {
         deps += [ "//chrome/test:load_library_perf_tests" ]
+        if (use_qt) {
+          deps -= [ "//chrome/test:load_library_perf_tests" ]
+        }
       }
       deps += [
         "//native_client/src/trusted/platform_qualify:vcpuid",
@@ -1043,12 +1069,19 @@ group("chromium_builder_perf") {
       "//media:media_perftests",
       "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
     ]
+    if (use_qt) {
+      data_deps -= [
+        "//chrome/test:load_library_perf_tests",
+        "//chrome/test:telemetry_perf_tests",
+        "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
+      ]
+    }
 
     if (is_android) {
       data += [ "//third_party/android_tools/sdk/platform-tools/adb" ]
     }
 
-    if (!is_chromeos) {
+    if (!is_chromeos && !use_qt) {
       data_deps += [ "//chrome/test:performance_browser_tests" ]
     }
     if (is_linux && !is_chromeos) {
diff --git a/chromium/chrome/browser/media/router/BUILD.gn b/chromium/chrome/browser/media/router/BUILD.gn
index 9ffad961491..4bbc63ea0e2 100644
--- a/chromium/chrome/browser/media/router/BUILD.gn
+++ b/chromium/chrome/browser/media/router/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 #
 
+import("//build/config/features.gni")
 import("//extensions/features/features.gni")
 import("//testing/test.gni")
 
@@ -98,6 +99,11 @@ static_library("test_support") {
     "//chrome/test:test_support",
     "//testing/gmock",
   ]
+  if (use_qt) {
+    deps -= [
+      "//chrome/test:test_support",
+    ]
+  }
   public_deps = [
     ":router",
   ]
diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn
index b99486d6070..a02e1dc6379 100644
--- a/chromium/chrome/test/BUILD.gn
+++ b/chromium/chrome/test/BUILD.gn
@@ -261,44 +261,6 @@ static_library("test_support") {
   }
 }
 
-group("telemetry_gpu_integration_test") {
-  testonly = true
-  deps = [
-    "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
-  ]
-
-  data = [
-    # For isolate contract.
-    "//testing/scripts/common.py",
-    "//testing/xvfb.py",
-    "//testing/scripts/run_gpu_integration_test_as_googletest.py",
-
-    "//content/test/gpu/",
-    "//content/test/data/gpu/",
-
-    # For the Maps WPR archive SHA. Include the entire directory to
-    # avoid having to update this BUILD.gn file if the WPR is
-    # re-recorded.
-    "//tools/perf/page_sets/data/",
-
-    # For depth_capture
-    "//content/test/data/media/depth_stream_test_utilities.js",
-    "//content/test/data/media/getusermedia-depth-capture.html",
-    "//content/test/data/media/webrtc_test_utilities.js",
-
-    # For GpuProcess.video
-    "//content/test/data/media/bear.ogv",
-
-    # For webgl_conformance
-    "//third_party/webgl/",
-    "//content/test/gpu/run_gpu_integration_test.py",
-
-    # For pixel_test
-    "//media/test/data/bear.mp4",
-    "//media/test/data/bear-vp9.webm",
-  ]
-}
-
 if (!is_android) {
   static_library("test_support_ui") {
     defines = []
@@ -999,64 +961,6 @@ if (!is_android && !is_fuchsia) {
       ]
     }
   }
-
-  group("telemetry_unittests") {
-    testonly = true
-    deps = [
-      "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
-    ]
-
-    data = [
-      "//tools/perf/run_telemetry_tests",
-
-      # For isolate contract.
-      "//testing/scripts/common.py",
-      "//testing/xvfb.py",
-      "//testing/scripts/run_telemetry_as_googletest.py",
-    ]
-
-    if (enable_package_mash_services) {
-      deps += [ "//chrome:chrome_test" ]
-      data_deps = [
-        "//chrome:chrome_test",
-      ]
-    }
-  }
-
-  group("telemetry_gpu_unittests_run") {
-    testonly = true
-    deps = [
-      ":telemetry_gpu_unittests",
-    ]
-  }
-
-  group("telemetry_gpu_unittests") {
-    deps = [
-      "//third_party/catapult/telemetry:telemetry_test_support",
-    ]
-    data = [
-      # TODO(kbr): refactor the telemetry dependencies more cleanly.
-      "//content/test/gpu/",
-      "//content/test/data/gpu/",
-
-      # For GpuProcess.video
-      "//content/test/data/media/bear.ogv",
-
-      # For webgl_conformance_expectations_unittest
-      "//third_party/webgl/src/sdk/tests/",
-
-      # For resolve the imports in content/test/gpu/run_gpu_test.py
-      "//tools/perf/core/",
-      "//tools/perf/chrome_telemetry_build/",
-
-      # From telemetry_gpu_unittests.isolate
-      "//third_party/pylint/",
-      "//third_party/logilab/",
-      "//testing/scripts/common.py",
-      "//testing/xvfb.py",
-      "//testing/scripts/run_telemetry_as_googletest.py",
-    ]
-  }
 }
 
 static_library("browser_tests_runner") {
diff --git a/chromium/extensions/BUILD.gn b/chromium/extensions/BUILD.gn
index 6b256eddffe..db7613cf7ee 100644
--- a/chromium/extensions/BUILD.gn
+++ b/chromium/extensions/BUILD.gn
@@ -356,4 +356,9 @@ source_set("chrome_extensions_interactive_uitests") {
     "//ui/resources:ui_test_pak",
     "//ui/web_dialogs:test_support",
   ]
+  if (use_qt) {
+    deps -= [
+      "//chrome/test:test_support",
+    ]
+  }
 }
diff --git a/chromium/media/mojo/services/BUILD.gn b/chromium/media/mojo/services/BUILD.gn
index 20e5fd4099d..1bf7a056700 100644
--- a/chromium/media/mojo/services/BUILD.gn
+++ b/chromium/media/mojo/services/BUILD.gn
@@ -110,6 +110,13 @@ component("services") {
     "//services/service_manager/public/interfaces",
   ]
 
+  if (use_qt) {
+    deps -= [
+      "//services/metrics/public/cpp:metrics_cpp",
+      "//services/metrics/public/cpp:ukm_builders",
+    ]
+  }
+
   if (is_android) {
     sources += [
       "android_mojo_media_client.cc",
diff --git a/chromium/media/mojo/services/watch_time_recorder.cc b/chromium/media/mojo/services/watch_time_recorder.cc
index d5760eafac1..f4f6d9eedfc 100644
--- a/chromium/media/mojo/services/watch_time_recorder.cc
+++ b/chromium/media/mojo/services/watch_time_recorder.cc
@@ -10,8 +10,11 @@
 #include "base/strings/string_piece.h"
 #include "media/base/watch_time_keys.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
+
+#if !defined(TOOLKIT_QT)
 #include "services/metrics/public/cpp/ukm_builders.h"
 #include "services/metrics/public/cpp/ukm_recorder.h"
+#endif
 
 namespace media {
 
@@ -150,6 +153,7 @@ void WatchTimeRecorder::UpdateUnderflowCount(int32_t count) {
 }
 
 void WatchTimeRecorder::RecordUkmPlaybackData() {
+#if !defined(TOOLKIT_QT)
   // UKM may be unavailable in content_shell or other non-chrome/ builds; it
   // may also be unavailable if browser shutdown has started; so this may be a
   // nullptr. If it's unavailable, UKM reporting will be skipped.
@@ -225,6 +229,7 @@ void WatchTimeRecorder::RecordUkmPlaybackData() {
   builder.SetVideoNaturalHeight(properties_->natural_size.height());
   builder.Record(ukm_recorder);
   aggregate_watch_time_info_.clear();
+#endif
 }
 
 WatchTimeRecorder::RebufferMapping::RebufferMapping(const RebufferMapping& copy)
diff --git a/chromium/services/resource_coordinator/BUILD.gn b/chromium/services/resource_coordinator/BUILD.gn
index 15cf7279a64..373e309cb33 100644
--- a/chromium/services/resource_coordinator/BUILD.gn
+++ b/chromium/services/resource_coordinator/BUILD.gn
@@ -5,6 +5,7 @@
 # There should be only one resource coordinator. It is currently
 # in the browser process. So, only //content/browser should link to this target.
 # Others modules should only need the public targets.
+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")
@@ -56,6 +57,17 @@ source_set("lib") {
     "//services/resource_coordinator/tracing:lib",
     "//services/service_manager/public/cpp/standalone_service:standalone_service",
   ]
+
+  if (use_qt) {
+    sources -= [
+      "observers/metrics_collector.cc",
+      "observers/metrics_collector.h",
+    ]
+    public_deps -= [
+      "//components/ukm:ukm",
+      "//services/metrics/public/cpp:ukm_builders",
+    ]
+  }
 }
 
 service_manifest("manifest") {
diff --git a/chromium/services/resource_coordinator/resource_coordinator_service.cc b/chromium/services/resource_coordinator/resource_coordinator_service.cc
index 386675af5ca..855e1310ab7 100644
--- a/chromium/services/resource_coordinator/resource_coordinator_service.cc
+++ b/chromium/services/resource_coordinator/resource_coordinator_service.cc
@@ -8,7 +8,9 @@
 
 #include "base/memory/ptr_util.h"
 #include "services/resource_coordinator/memory_instrumentation/coordinator_impl.h"
+#if !defined(TOOLKIT_QT)
 #include "services/resource_coordinator/observers/metrics_collector.h"
+#endif
 #include "services/resource_coordinator/observers/tab_signal_generator_impl.h"
 #include "services/resource_coordinator/service_callbacks_impl.h"
 #include "services/resource_coordinator/tracing/agent_registry.h"
@@ -52,8 +54,10 @@ void ResourceCoordinatorService::OnStart() {
   coordination_unit_manager_.RegisterObserver(
       std::move(tab_signal_generator_impl));
 
+#if !defined(TOOLKIT_QT)
   coordination_unit_manager_.RegisterObserver(
       base::MakeUnique<MetricsCollector>());
+#endif
 
   coordination_unit_manager_.OnStart(&registry_, ref_factory_.get());
 
diff --git a/chromium/tools/perf/BUILD.gn b/chromium/tools/perf/BUILD.gn
index 55dacdd18b7..76ae25cb742 100644
--- a/chromium/tools/perf/BUILD.gn
+++ b/chromium/tools/perf/BUILD.gn
@@ -2,6 +2,8 @@
 # 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")
+
 group("perf") {
   testonly = true
   deps = [
@@ -34,6 +36,11 @@ group("perf") {
     # For Pylib used by VR tests
     "//build/android/pylib/",
   ]
+  if (use_qt) {
+    deps -= [
+      "//tools/perf/chrome_telemetry_build:telemetry_chrome_test",
+    ]
+  }
 }
 
 if (is_android) {