content/content_tests.gypi - Issue 685703002: Reland "Replace Chrome IPC with Mojo IPC for querying BatteryStatus service"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/content_tests.gypi

Issue 685703002: Reland "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, 2 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 | « content/content_renderer.gypi ('k') | content/public/android/java/src/org/chromium/content/browser/BatteryStatusManager.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_tests.gypi

diff --git a/content/content_tests.gypi b/content/content_tests.gypi

index 03c64ce945def23345999d065f92d9e8b019f6b2..1e0024f4604c8aeddd2f25885f081d7c758da3d1 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -399,9 +399,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',

@@ -696,7 +693,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',

@@ -917,7 +913,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'],

}],

@@ -970,7 +965,6 @@

}],

['use_dbus==0', {

'sources!': [

- 'browser/battery_status/battery_status_manager_linux_unittest.cc',

'browser/geolocation/wifi_data_provider_linux_unittest.cc',

}],

@@ -1139,6 +1133,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',

@@ -1824,6 +1820,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',

'../mojo/public/mojo_public.gyp:mojo_public_test_interfaces',