Make //device pass "gn check"

Review URL: https://codereview.chromium.org/1484643002

Cr-Commit-Position: refs/heads/master@{#363307}

10 files changed, 22 insertions, 11 deletions

diff --git a/.gn b/.gn
index eeefe47..f86b832 100644
--- a/.gn
+++ b/.gn
@@ -43,8 +43,7 @@ check_targets = [
   "//crypto/*",
   "//data/*",
   "//dbus/*",
-
-  #"//device/*",  # Ran into http://crbug.com/500761 adding dbus dependency
+  "//device/*",
 
   #"//extensions/*",  # Lots of errors.
   #"//gin/*",  # Easy.
diff --git a/build/linux/BUILD.gn b/build/linux/BUILD.gn
index a66d86c..6a1939d 100644
--- a/build/linux/BUILD.gn
+++ b/build/linux/BUILD.gn
@@ -100,7 +100,7 @@ generate_library_loader("udev1_loader") {
 }
 
 group("udev") {
-  deps = [
+  public_deps = [
     ":udev0_loader",
     ":udev1_loader",
   ]
diff --git a/device/BUILD.gn b/device/BUILD.gn
index 5c53606..1d0e641 100644
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -62,6 +62,7 @@ test("device_unittests") {
     "//device/bluetooth",
     "//device/bluetooth:mocks",
     "//device/nfc",
+    "//mojo/common",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
     "//net",
@@ -134,6 +135,7 @@ test("device_unittests") {
   # UsbContext is a libusb-specific object.
   if (!is_android && !is_ios) {
     sources += [ "usb/usb_context_unittest.cc" ]
+    deps += [ "//third_party/libusb" ]
   }
 
   if (is_android) {
diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
index aae32f6..4bfdaec 100644
--- a/device/bluetooth/BUILD.gn
+++ b/device/bluetooth/BUILD.gn
@@ -116,10 +116,11 @@ component("bluetooth") {
   deps = [
     "//base",
     "//crypto",
+    "//device/bluetooth/strings",
+    "//device/bluetooth/uribeacon",
+    "//ipc",
     "//net",
     "//ui/base",
-    "strings",
-    "uribeacon",
   ]
 
   if (is_android) {
diff --git a/device/devices_app/BUILD.gn b/device/devices_app/BUILD.gn
index 3b13142..2601cf2 100644
--- a/device/devices_app/BUILD.gn
+++ b/device/devices_app/BUILD.gn
@@ -20,6 +20,7 @@ source_set("lib") {
     "//device/core",
     "//device/devices_app/usb/public/interfaces",
     "//device/usb",
+    "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/bindings:callback",
     "//net",
diff --git a/device/serial/BUILD.gn b/device/serial/BUILD.gn
index f66cedf..474317e 100644
--- a/device/serial/BUILD.gn
+++ b/device/serial/BUILD.gn
@@ -49,6 +49,7 @@ static_library("serial") {
   ]
   deps = [
     "//mojo/public/cpp/system",
+    "//net",
     "//third_party/re2",
   ]
 
@@ -56,7 +57,10 @@ static_library("serial") {
     deps += [ "//device/udev_linux" ]
   }
   if (is_chromeos) {
-    deps += [ "//chromeos" ]
+    deps += [
+      "//chromeos",
+      "//dbus",
+    ]
   }
 }
 
diff --git a/device/serial/serial_io_handler.cc b/device/serial/serial_io_handler.cc
index 1cfb1cd..b9df970 100644
--- a/device/serial/serial_io_handler.cc
+++ b/device/serial/serial_io_handler.cc
@@ -12,7 +12,7 @@
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/permission_broker_client.h"
-#include "dbus/file_descriptor.h"
+#include "dbus/file_descriptor.h"  // nogncheck
 #endif  // defined(OS_CHROMEOS)
 
 namespace device {
diff --git a/device/test/test_device_client.cc b/device/test/test_device_client.cc
index f380c2c..ff6933e 100644
--- a/device/test/test_device_client.cc
+++ b/device/test/test_device_client.cc
@@ -4,8 +4,12 @@
 
 #include "device/test/test_device_client.h"
 
-#include "device/hid/hid_service.h"
-#include "device/usb/usb_service.h"
+// This file unconditionally includes these headers despite conditionally
+// depending on the corresponding targets. The code below needs the destructors
+// of the classes defined even when the classes are never instantiated.
+// TODO: This should probably be done more explicitly to avoid ambiguity.
+#include "device/hid/hid_service.h"  // nogncheck
+#include "device/usb/usb_service.h"  // nogncheck
 
 namespace device {
 
diff --git a/device/usb/usb_device_impl.cc b/device/usb/usb_device_impl.cc
index e1fc402..ab9bd4a 100644
--- a/device/usb/usb_device_impl.cc
+++ b/device/usb/usb_device_impl.cc
@@ -22,7 +22,7 @@
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/permission_broker_client.h"
-#include "dbus/file_descriptor.h"
+#include "dbus/file_descriptor.h"  // nogncheck
 #endif  // defined(OS_CHROMEOS)
 
 namespace device {
diff --git a/tools/generate_library_loader/generate_library_loader.gni b/tools/generate_library_loader/generate_library_loader.gni
index 24f753b..c714c12 100644
--- a/tools/generate_library_loader/generate_library_loader.gni
+++ b/tools/generate_library_loader/generate_library_loader.gni
@@ -63,7 +63,7 @@ template("generate_library_loader") {
       output_cc,
       output_h,
     ]
-    deps = [
+    public_deps = [
       ":${target_name}_loader",
     ]
   }