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

Unified Diff: content/content_tests.gypi

Issue 592153002: Replace Chrome IPC with Mojo IPC for querying BatteryStatus service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Tim's comments. 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
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index ae0bd5dcda81e0e72e1a48a0cccee24da0a01427..9b4fae9f50d7f390a66d235a7436b2e2238a73f6 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -397,9 +397,6 @@
'browser/appcache/mock_appcache_storage.cc',
'browser/appcache/mock_appcache_storage.h',
'browser/appcache/mock_appcache_storage_unittest.cc',
- 'browser/battery_status/battery_status_manager_linux_unittest.cc',
- 'browser/battery_status/battery_status_manager_win_unittest.cc',
- 'browser/battery_status/battery_status_service_unittest.cc',
'browser/browser_thread_unittest.cc',
'browser/browser_url_handler_impl_unittest.cc',
'browser/byte_stream_unittest.cc',
@@ -688,7 +685,6 @@
'renderer/active_notification_tracker_unittest.cc',
'renderer/android/email_detector_unittest.cc',
'renderer/android/phone_number_detector_unittest.cc',
- 'renderer/battery_status/battery_status_dispatcher_unittest.cc',
'renderer/bmp_image_decoder_unittest.cc',
'renderer/device_sensors/device_light_event_pump_unittest.cc',
'renderer/device_sensors/device_motion_event_pump_unittest.cc',
@@ -888,7 +884,6 @@
'../chromeos/chromeos.gyp:chromeos',
],
'sources/': [
- ['exclude', '^browser/battery_status/battery_status_manager_linux_unittest.cc'],
['exclude', '^browser/geolocation/wifi_data_provider_linux_unittest.cc'],
],
}],
@@ -941,7 +936,6 @@
}],
['use_dbus==0', {
'sources!': [
- 'browser/battery_status/battery_status_manager_linux_unittest.cc',
'browser/geolocation/wifi_data_provider_linux_unittest.cc',
],
}],
@@ -1105,6 +1099,8 @@
'test_support_content',
'web_ui_test_mojo_bindings',
'../base/base.gyp:test_support_base',
+ '../device/battery/battery.gyp:device_battery',
+ '../device/battery/battery.gyp:device_battery_mojo_bindings',
'../gin/gin.gyp:gin',
'../gpu/gpu.gyp:gpu',
'../ipc/ipc.gyp:test_support_ipc',
@@ -1762,6 +1758,7 @@
'../base/base.gyp:base_java',
'../base/base.gyp:base_javatests',
'../base/base.gyp:base_java_test_support',
+ '../device/battery/battery.gyp:device_battery_javatests',
'../media/media.gyp:media_java',
'../media/media.gyp:media_test_support',
'../net/net.gyp:net_java',

Powered by Google App Engine
This is Rietveld 408576698