Reland "Replace Chrome IPC with Mojo IPC for querying BatteryStatus service"

content/content_tests.gypi

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 381 matching lines @@
         'browser/appcache/appcache_update_job_unittest.cc',
         'browser/appcache/appcache_url_request_job_unittest.cc',
         'browser/appcache/chrome_appcache_service_unittest.cc',
         'browser/appcache/mock_appcache_policy.cc',
         'browser/appcache/mock_appcache_policy.h',
         'browser/appcache/mock_appcache_service.cc',
         'browser/appcache/mock_appcache_service.h',
         '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',
         'browser/child_process_security_policy_unittest.cc',
         'browser/cocoa/system_hotkey_map_unittest.mm',
         'browser/compositor/buffer_queue_unittest.cc',
         'browser/compositor/software_browser_compositor_output_surface_unittest.cc',
         'browser/compositor/software_output_device_ozone_unittest.cc',
         'browser/databases_table_unittest.cc',
         'browser/database_quota_client_unittest.cc',
@@ skipping 274 matching lines @@
         'common/sandbox_mac_diraccess_unittest.mm',
         'common/sandbox_mac_fontloading_unittest.mm',
         'common/sandbox_mac_system_access_unittest.mm',
         'common/sandbox_mac_unittest_helper.h',
         'common/sandbox_mac_unittest_helper.mm',
         'common/shareable_file_reference_unittest.cc',
         'common/webplugininfo_unittest.cc',
         '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',
         'renderer/device_sensors/device_orientation_event_pump_unittest.cc',
         'renderer/disambiguation_popup_helper_unittest.cc',
         'renderer/dom_storage/dom_storage_cached_area_unittest.cc',
         'renderer/gpu/frame_swap_message_queue_unittest.cc',
         'renderer/gpu/queue_message_swap_promise_unittest.cc',
         'renderer/gpu/render_widget_compositor_unittest.cc',
         'renderer/ico_image_decoder_unittest.cc',
@@ skipping 200 matching lines @@
         ['OS=="mac"', {
           # These flags are needed to run the test on Mac.
           # Search for comments about "xcode_settings" in chrome_tests.gypi.
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
         }],
         ['chromeos==1', {
           'dependencies': [
             '../chromeos/chromeos.gyp:chromeos',
           ],
           'sources/': [
-            ['exclude', '^browser/battery_status/battery_status_manager_linux_unittest.cc'],
             ['exclude', '^browser/geolocation/wifi_data_provider_linux_unittest.cc'],
           ],
         }],
         ['use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:aura',
             '../ui/wm/wm.gyp:wm',
           ]
         }],
         ['use_aura==1 or toolkit_views==1', {
@@ skipping 32 matching lines @@
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
         ['use_aura!=1 and OS!="android"', {
           'sources!': [
             'browser/renderer_host/input/tap_suppression_controller_unittest.cc',
           ],
         }],
         ['use_dbus==0', {
           'sources!': [
-            'browser/battery_status/battery_status_manager_linux_unittest.cc',
             'browser/geolocation/wifi_data_provider_linux_unittest.cc',
           ],
         }],
         ['OS!="win" and OS!="mac"', {
           'sources!': [
             'common/plugin_list_unittest.cc',
           ],
         }],
         ['use_ozone==1', {
           'dependencies': [
@@ skipping 148 matching lines @@
             'content.gyp:content_gpu',
             'content.gyp:content_plugin',
             'content.gyp:content_renderer',
             'content.gyp:content_resources',
             'content_browser_test_support',
             'content_shell_lib',
             'content_shell_pak',
             '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',
             '../media/media.gyp:media_test_support',
             '../media/media.gyp:shared_memory_support',
             '../mojo/edk/mojo_edk.gyp:mojo_common_test_support',
             '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
             '../mojo/mojo_base.gyp:mojo_environment_chromium',
             '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
             '../mojo/public/mojo_public.gyp:mojo_js_bindings',
@@ skipping 665 matching lines @@
           #     and //content/public/android:content_javatests
           'target_name': 'content_shell_test_apk',
           'type': 'none',
           'dependencies': [
             'content_java_test_support',
             'content_shell_apk_java',
             'content.gyp:content_java',
             '../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',
             '../net/net.gyp:net_java',
             '../net/net.gyp:net_javatests',
             '../net/net.gyp:net_java_test_support',
           ],
           'variables': {
             'apk_name': 'ContentShellTest',
             'java_in_dir': 'shell/android/javatests',
@@ skipping 144 matching lines @@
                   'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
                 },
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }