Revert of Replace Chrome IPC with Mojo IPC for querying BatteryStatus service

content/browser/BUILD.gn

Index: content/browser/BUILD.gn
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index eaac4c8f6372aff49b5a1f277fdcb1749c7df767..cab6cb955c95f4dbf8122a70aaeb2751aa75650d 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -25,7 +25,6 @@
     "//content/browser/speech/proto",
     "//content/public/common:common_sources",
     "//crypto",
-    "//device/battery",
     "//google_apis",
     "//net",
     "//skia",
@@ -269,13 +268,21 @@
     sources -= [ "power_save_blocker_x11.cc", ]
   }
 
-  # Dealing with *wifi_data_provider_*.cc is also a bit complicated given
-  # android, chromeos, linux and use_dbus.
+  # Dealing with battery_status_manager_*.cc and *wifi_data_provider_*.cc
+  # is also a bit complicated given android, chromeos, linux and use_dbus.
+  if (is_android || is_chromeos || (is_linux && use_dbus)) {
+    sources -= [ "battery_status/battery_status_manager_default.cc" ]
+  }
+  if (is_chromeos || (is_linux && !use_dbus)) {
+    # This will already have gotten removed for all non-Linux cases.
+    sources -= [
+      "battery_status/battery_status_manager_linux.cc",
+      "geolocation/wifi_data_provider_linux.cc"
+    ]
+  }
+
   if (is_android) {
     sources -= [ "geolocation/wifi_data_provider_common.cc" ]
-  }
-  if (is_chromeos || (is_linux && !use_dbus)) {
-    sources -= [ "geolocation/wifi_data_provider_linux.cc" ]
   }
   if (is_linux && use_dbus) {
     sources -= [ "geolocation/empty_wifi_data_provider.cc" ]
@@ -407,7 +414,7 @@
   }
 
   if (is_linux && use_dbus) {
-    deps += [ "//dbus" ]
+      deps += [ "//dbus" ]
   }
 
   if (enable_browser_cdms) {