12 files changed, 45 insertions, 17 deletions
diff --git a/components/audio_modem/BUILD.gn b/components/audio_modem/BUILD.gn
index bb4b4b0..d14a7b3 100644
--- a/components/audio_modem/BUILD.gn
+++ b/components/audio_modem/BUILD.gn
@@ -3,11 +3,6 @@
 # found in the LICENSE file.
 
 source_set("audio_modem") {
-  public = [
-    "public/audio_modem_types.h",
-    "public/modem.h",
-    "public/whispernet_client.h",
-  ]
   sources = [
     "audio_modem_switches.cc",
     "audio_modem_switches.h",
@@ -20,11 +15,14 @@ source_set("audio_modem") {
     "constants.cc",
     "modem_impl.cc",
     "modem_impl.h",
+    "public/audio_modem_types.h",
+    "public/modem.h",
+    "public/whispernet_client.h",
   ]
 
   deps = [
     "//base",
-    "//content",
+    "//content/public/browser",
     "//media",
     "//media:shared_memory_support",
     "//third_party/webrtc/common_audio",
@@ -48,6 +46,7 @@ source_set("test_support") {
   deps = [
     "//base",
     "//media",
+    "//media:shared_memory_support",
   ]
 }
 
@@ -63,6 +62,10 @@ source_set("unit_tests") {
 
   deps = [
     ":test_support",
+    "//base",
+    "//content/test:test_support",
+    "//media",
+    "//media:shared_memory_support",
     "//testing/gtest",
   ]
 }
diff --git a/components/browser_watcher/BUILD.gn b/components/browser_watcher/BUILD.gn
index 376699d..bdf78ee 100644
--- a/components/browser_watcher/BUILD.gn
+++ b/components/browser_watcher/BUILD.gn
@@ -31,6 +31,7 @@ source_set("browser_watcher_client") {
   ]
   deps = [
     "//base",
+    "//components/metrics",
   ]
 }
 
@@ -48,6 +49,8 @@ source_set("unit_tests") {
   deps = [
     ":browser_watcher",
     ":browser_watcher_client",
+    "//base",
+    "//base/test:test_support",
     "//testing/gtest",
   ]
 }
diff --git a/components/bubble/BUILD.gn b/components/bubble/BUILD.gn
index 2519128..3175783 100644
--- a/components/bubble/BUILD.gn
+++ b/components/bubble/BUILD.gn
@@ -14,6 +14,10 @@ source_set("bubble") {
     "bubble_reference.h",
     "bubble_ui.h",
   ]
+
+  deps = [
+    "//base",
+  ]
 }
 
 source_set("test_support") {
diff --git a/components/cdm/browser/BUILD.gn b/components/cdm/browser/BUILD.gn
index cea393b..1a6e272 100644
--- a/components/cdm/browser/BUILD.gn
+++ b/components/cdm/browser/BUILD.gn
@@ -15,6 +15,7 @@ source_set("browser") {
     "//components/cdm/common",
     "//content/public/browser",
     "//content/public/common",
+    "//ipc",
     "//media",
   ]
 }
diff --git a/components/cdm/common/BUILD.gn b/components/cdm/common/BUILD.gn
index 7af3869..6ca677c 100644
--- a/components/cdm/common/BUILD.gn
+++ b/components/cdm/common/BUILD.gn
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-static_library("common") {
+source_set("common") {
   sources = [
     "cdm_message_generator.cc",
     "cdm_message_generator.h",
@@ -12,6 +12,7 @@ static_library("common") {
   deps = [
     "//base",
     "//content/public/common",
+    "//media",
     "//ipc",
   ]
 }
diff --git a/components/certificate_reporting/BUILD.gn b/components/certificate_reporting/BUILD.gn
index c175e6c..d54b291 100644
--- a/components/certificate_reporting/BUILD.gn
+++ b/components/certificate_reporting/BUILD.gn
@@ -15,9 +15,11 @@ static_library("certificate_reporting") {
     "error_reporter.h",
   ]
 
-  deps = [
+  public_deps = [
     ":cert_logger_proto",
     ":encrypted_cert_logger_proto",
+  ]
+  deps = [
     "//base",
     "//crypto",
     "//net",
diff --git a/components/certificate_transparency/BUILD.gn b/components/certificate_transparency/BUILD.gn
index c541f97..e09e6f2 100644
--- a/components/certificate_transparency/BUILD.gn
+++ b/components/certificate_transparency/BUILD.gn
@@ -25,6 +25,8 @@ source_set("unit_tests") {
   deps = [
     ":certificate_transparency",
     "//base/test:test_support",
+    "//components/safe_json:test_support",
+    "//net:test_support",
     "//testing/gtest",
   ]
 }
diff --git a/components/clipboard/BUILD.gn b/components/clipboard/BUILD.gn
index 74a391d..ea8ddfd 100644
--- a/components/clipboard/BUILD.gn
+++ b/components/clipboard/BUILD.gn
@@ -13,9 +13,11 @@ source_set("lib") {
   ]
 
   deps = [
+    "//base",
     "//components/clipboard/public/interfaces",
     "//mojo/application/public/cpp",
     "//third_party/mojo/src/mojo/public/cpp/bindings",
+    "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
   ]
 }
 
@@ -44,8 +46,12 @@ mojo_native_application("apptests") {
   deps = [
     "//base",
     "//components/clipboard/public/interfaces",
+    "//mojo/application/public/cpp",
     "//mojo/application/public/cpp:test_support",
+    "//mojo/common",
   ]
 
-  data_deps = [ ":clipboard" ]
+  data_deps = [
+    ":clipboard",
+  ]
 }
diff --git a/components/component_updater/BUILD.gn b/components/component_updater/BUILD.gn
index c75b509..a868cdd 100644
--- a/components/component_updater/BUILD.gn
+++ b/components/component_updater/BUILD.gn
@@ -42,6 +42,8 @@ source_set("unit_tests") {
   deps = [
     ":component_updater",
     "//base",
+    "//base/test:test_support",
+    "//components/update_client:test_support",
     "//testing/gtest",
     "//testing/gmock",
   ]
diff --git a/components/compression/BUILD.gn b/components/compression/BUILD.gn
index e35fe23..d835c8b 100644
--- a/components/compression/BUILD.gn
+++ b/components/compression/BUILD.gn
@@ -21,6 +21,7 @@ source_set("unit_tests") {
   ]
   deps = [
     ":compression",
+    "//base",
     "//testing/gtest",
   ]
 }
diff --git a/components/crash/content/browser/BUILD.gn b/components/crash/content/browser/BUILD.gn
index 1af0d89..4432357 100644
--- a/components/crash/content/browser/BUILD.gn
+++ b/components/crash/content/browser/BUILD.gn
@@ -12,6 +12,13 @@ source_set("browser") {
     "crash_dump_manager_android.h",
   ]
 
+  deps = [
+    "//base",
+    "//components/crash/content/app",
+    "//content/public/browser",
+    "//content/public/common",
+  ]
+
   if (is_linux || is_android) {
     set_sources_assignment_filter([])
 
@@ -20,15 +27,9 @@ source_set("browser") {
       "crash_handler_host_linux.cc",
       "crash_handler_host_linux.h",
     ]
+    deps += [ "//breakpad:client" ]
   }
 
-  deps = [
-    "//base",
-    "//components/crash/content/app",
-    "//content/public/browser",
-    "//content/public/common",
-  ]
-
   # This is not in the GYP build but this target includes breakpad client
   # headers, so add the dependency here.
   if (is_posix && !is_ios) {
diff --git a/components/update_client/BUILD.gn b/components/update_client/BUILD.gn
index ec76b7e..eeefaea 100644
--- a/components/update_client/BUILD.gn
+++ b/components/update_client/BUILD.gn
@@ -74,8 +74,10 @@ source_set("test_support") {
     "url_request_post_interceptor.h",
   ]
 
-  deps = [
+  public_deps = [
     ":update_client",
+  ]
+  deps = [
     "//base",
     "//net:test_support",
     "//testing/gtest",