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

content/content_browser.gypi

Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index c9dcea98fcadff1ab5991750a79acb0bab1741e7..07f5b92c24f38904fbb9980831e3cf8675210e71 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -6,6 +6,8 @@
   'dependencies': [
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
+    '../device/battery/battery.gyp:device_battery',
+    '../device/battery/battery.gyp:device_battery_mojo_bindings',
     '../google_apis/google_apis.gyp:google_apis',
     '../net/net.gyp:net',
     '../skia/skia.gyp:skia',
@@ -378,20 +380,6 @@
       'browser/appcache/appcache_manifest_parser.h',
       'browser/appcache/view_appcache_internals_job.cc',
       'browser/appcache/view_appcache_internals_job.h',
-      'browser/battery_status/battery_status_manager_android.cc',
-      'browser/battery_status/battery_status_manager_android.h',
-      'browser/battery_status/battery_status_manager_chromeos.cc',
-      'browser/battery_status/battery_status_manager_default.cc',
-      'browser/battery_status/battery_status_manager_linux.cc',
-      'browser/battery_status/battery_status_manager_linux.h',
-      'browser/battery_status/battery_status_manager_mac.cc',
-      'browser/battery_status/battery_status_manager_win.cc',
-      'browser/battery_status/battery_status_manager_win.h',
-      'browser/battery_status/battery_status_manager.h',
-      'browser/battery_status/battery_status_message_filter.cc',
-      'browser/battery_status/battery_status_message_filter.h',
-      'browser/battery_status/battery_status_service.cc',
-      'browser/battery_status/battery_status_service.h',
       'browser/bootstrap_sandbox_mac.cc',
       'browser/bootstrap_sandbox_mac.h',
       'browser/browser_child_process_host_impl.cc',
@@ -1806,7 +1794,6 @@
         ],
       },
       'sources/': [
-        ['exclude', '^browser/battery_status/battery_status_manager_default\\.cc$'],
         ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default\\.cc$'],
         ['exclude', '^browser/geolocation/network_location_provider\\.(cc|h)$'],
         ['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'],
@@ -1831,7 +1818,6 @@
       ],
       'sources!': [
         'browser/geolocation/empty_wifi_data_provider.cc',
-        'browser/battery_status/battery_status_manager_default.cc',
       ],
       'dependencies': [
         '../third_party/mozilla/mozilla.gyp:mozilla',
@@ -1849,8 +1835,6 @@
         '../chromeos/chromeos.gyp:power_manager_proto',
       ],
       'sources!': [
-        'browser/battery_status/battery_status_manager_default.cc',
-        'browser/battery_status/battery_status_manager_linux.cc',
         'browser/geolocation/wifi_data_provider_linux.cc',
         'browser/power_save_blocker_ozone.cc',
         'browser/power_save_blocker_x11.cc',
@@ -1902,13 +1886,11 @@
     }],
     ['OS == "win"', {
       'sources!': [
-        'browser/battery_status/battery_status_manager_default.cc',
         'browser/geolocation/empty_wifi_data_provider.cc',
       ],
     }],
     ['OS == "linux" and use_dbus==1', {
       'sources!': [
-        'browser/battery_status/battery_status_manager_default.cc',
         'browser/geolocation/empty_wifi_data_provider.cc',
       ],
       'dependencies': [
@@ -1917,7 +1899,6 @@
       ],
     }, {  # OS != "linux" or use_dbus==0
       'sources!': [
-        'browser/battery_status/battery_status_manager_linux.cc',
         'browser/geolocation/wifi_data_provider_linux.cc',
       ],
     }],