Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2526)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: device/device_tests.gyp

Issue 497363004: Merge components/usb_service into device/usb. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/core/device_client.cc ('k') | device/test/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/device_tests.gyp
diff --git a/device/device_tests.gyp b/device/device_tests.gyp
index 6b5a59b82c492a4b4b173e840facd00e88ebddd0..9faa1a37c23309a775f989b66c901856ea8dd8b9 100644
--- a/device/device_tests.gyp
+++ b/device/device_tests.gyp
@@ -12,7 +12,6 @@
'type': '<(gtest_target_type)',
'dependencies': [
'../base/base.gyp:test_support_base',
- '../components/components.gyp:usb_service',
'../mojo/mojo_base.gyp:mojo_environment_chromium',
'../mojo/mojo_base.gyp:mojo_system_impl',
'../testing/gmock.gyp:gmock',
@@ -41,6 +40,8 @@
'bluetooth/bluetooth_uuid_unittest.cc',
'nfc/nfc_chromeos_unittest.cc',
'nfc/nfc_ndef_record_unittest.cc',
+ 'usb/usb_context_unittest.cc',
+ 'usb/usb_device_filter_unittest.cc',
'usb/usb_ids_unittest.cc',
'usb/usb_service_unittest.cc',
'hid/hid_connection_unittest.cc',
« no previous file with comments | « device/core/device_client.cc ('k') | device/test/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698