1 files changed, 8 insertions, 100 deletions

diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn
index d349a6e3378..1c77c910a5d 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 = []
@@ -658,7 +620,7 @@ if (!is_android) {
             # suites, it seems like one or another starts timing out too.
             "../browser/ui/views/keyboard_access_browsertest.cc",
           ]
-          if (!use_ozone) {
+          if (use_gtk) {
             sources += [ "../browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc" ]
             deps += [ "//build/config/linux/gtk" ]
           }
@@ -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") {
@@ -1678,12 +1582,16 @@ test("browser_tests") {
     data_deps += [
       "//ppapi:ppapi_tests",
       "//ppapi:power_saver_test_plugin",
-      "//remoting/webapp:browser_test_resources",
-      "//remoting/webapp:unit_tests",
       "//third_party/mesa:osmesa",
       "//third_party/widevine/cdm:widevine_test_license_server",
     ]
 
+    if (enable_remoting) {
+      data_deps += [
+        "//remoting/webapp:browser_test_resources",
+        "//remoting/webapp:unit_tests",
+      ]
+    }
     data += [
       "data/",
       "//chrome/browser/policy/test/asn1der.py",
@@ -4366,7 +4274,7 @@ test("unit_tests") {
   if (use_gio) {
     deps += [ "//build/linux/libgio" ]
   }
-  if (!is_chromeos && !use_ozone && is_linux) {
+  if (!is_chromeos && !use_ozone && is_linux && use_gtk) {
     deps += [ "//chrome/browser/ui/libgtkui" ]
   }