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

Unified Diff: device/device_tests.gyp

Issue 457933002: Replace Chrome IPC with Mojo IPC for querying BatteryStatus service Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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/battery/battery_status_service_unittest.cc ('k') | mojo/common/handle_watcher.cc » ('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 5cb565a60d748d5d887ac74b1edeec236c697b88..5c6197b606f12d68738e372fe67235d6a081a6c4 100644
--- a/device/device_tests.gyp
+++ b/device/device_tests.gyp
@@ -12,11 +12,14 @@
'type': '<(gtest_target_type)',
'dependencies': [
'../base/base.gyp:test_support_base',
+ '../mojo/mojo_base.gyp:mojo_cpp_bindings',
'../mojo/mojo_base.gyp:mojo_environment_chromium',
'../mojo/mojo_base.gyp:mojo_system_impl',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../tools/usb_gadget/usb_gadget.gyp:usb_gadget',
+ 'battery/battery.gyp:device_battery',
+ 'battery/battery.gyp:device_battery_mojo_bindings',
'bluetooth/bluetooth.gyp:device_bluetooth',
'bluetooth/bluetooth.gyp:device_bluetooth_mocks',
'nfc/nfc.gyp:device_nfc',
@@ -26,6 +29,9 @@
'serial/serial.gyp:device_serial_test_util',
],
'sources': [
+ 'battery/battery_status_manager_linux_unittest.cc',
+ 'battery/battery_status_manager_win_unittest.cc',
+ 'battery/battery_status_service_unittest.cc',
'bluetooth/bluetooth_adapter_mac_unittest.mm',
'bluetooth/bluetooth_adapter_unittest.cc',
'bluetooth/bluetooth_adapter_win_unittest.cc',
@@ -64,7 +70,10 @@
'../chromeos/chromeos.gyp:chromeos_test_support',
'../chromeos/chromeos.gyp:chromeos_test_support_without_gmock',
'../dbus/dbus.gyp:dbus',
- ]
+ ],
+ 'sources!': [
+ 'battery/battery_status_manager_linux_unittest.cc',
+ ],
}],
['OS=="mac"', {
'link_settings': {
@@ -95,6 +104,11 @@
['exclude', '^hid/'],
],
}],
+ ['use_dbus==0', {
+ 'sources!': [
+ 'battery/battery_status_manager_linux_unittest.cc',
+ ],
+ }],
],
},
],
« no previous file with comments | « device/battery/battery_status_service_unittest.cc ('k') | mojo/common/handle_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698