1 files changed, 5 insertions, 33 deletions
diff --git a/components/storage_monitor/BUILD.gn b/components/storage_monitor/BUILD.gn
index bb7034b..48b34d0 100644
--- a/components/storage_monitor/BUILD.gn
+++ b/components/storage_monitor/BUILD.gn
@@ -5,7 +5,7 @@
 import("//build/config/features.gni")
 
 # GYP version: components/storage_monitor.gypi:storage_monitor
-source_set("storage_monitor") {
+static_library("storage_monitor") {
   sources = [
     "image_capture_device.h",
     "image_capture_device.mm",
@@ -85,7 +85,7 @@ source_set("storage_monitor") {
 }
 
 # GYP version: components/storage_monitor.gypi:storage_monitor_test_support
-source_set("test_support") {
+static_library("test_support") {
   sources = [
     "mock_removable_storage_observer.cc",
     "mock_removable_storage_observer.h",
@@ -101,44 +101,16 @@ source_set("test_support") {
     "test_volume_mount_watcher_win.h",
   ]
 
-  public_deps = [
-    ":storage_monitor",
+  deps = [
     "//base",
+    ":storage_monitor",
   ]
 
   if (is_linux) {
-    deps = [
+    deps += [
       "//device/media_transfer_protocol",
       "//device/media_transfer_protocol:mtp_file_entry_proto",
       "//device/media_transfer_protocol:mtp_storage_info_proto",
     ]
   }
 }
-
-source_set("unit_tests") {
-  testonly = true
-  sources = [
-    "image_capture_device_manager_unittest.mm",
-    "media_storage_util_unittest.cc",
-    "media_transfer_protocol_device_observer_linux_unittest.cc",
-    "storage_info_unittest.cc",
-    "storage_monitor_mac_unittest.mm",
-    "storage_monitor_unittest.cc",
-    "storage_monitor_win_unittest.cc",
-  ]
-  deps = [
-    ":test_support",
-    "//testing/gtest",
-  ]
-
-  if (is_linux && !is_chromeos) {
-    sources += [ "storage_monitor_linux_unittest.cc" ]
-  }
-  if (is_chromeos) {
-    sources += [ "storage_monitor_chromeos_unittest.cc" ]
-    deps += [
-      "//chromeos:test_support",
-      "//testing/gmock",
-    ]
-  }
-}