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

content/browser/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//content/browser/browser.gni")
 import("//media/media_options.gni")
 
 source_set("browser") {
   # Only the public target should depend on this. All other targets (even
   # internal content ones) should depend on the public one.
   visibility = [ "//content/public/browser:browser_sources" ]
 
   defines = []
   libs = []
   ldflags = []
 
   # Shared deps. See also non-iOS deps below.
   deps = [
     "//base",
     "//base:base_static",
     "//content:resources",
     "//content/browser/service_worker:proto",
     "//content/browser/speech/proto",
     "//content/public/common:common_sources",
     "//crypto",
-    "//device/battery",
     "//google_apis",
     "//net",
     "//skia",
     "//sql",
     "//third_party/npapi",
     "//third_party/re2",
     "//third_party/WebKit/public:blink_headers",
     "//third_party/zlib",
     "//third_party/zlib:zip",
     "//ui/accessibility",
@@ skipping 223 matching lines @@
   # Dealing with power_save_blocker_{x11,ozone}.cc is a little complicated
   # given the interaction between os_chromeos and the feature flags for X11 and
   # ozone, so do it all in one spot.
   if (is_chromeos || !use_ozone) {
     sources -= [ "power_save_blocker_ozone.cc", ]
   }
   if (is_chromeos || !use_x11) {
     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" ]
   }
 
   if (use_pango) {
     configs += [ "//build/config/linux:pangocairo" ]
   }
 
   if (is_android) {
     sources += rebase_path(content_browser_gypi_values.android_browser_sources,
@@ skipping 110 matching lines @@
   }
 
   if (enable_web_speech) {
     deps += [
       "//third_party/flac",
       "//third_party/speex",
     ]
   }
 
   if (is_linux && use_dbus) {
-    deps += [ "//dbus" ]
+      deps += [ "//dbus" ]
   }
 
   if (enable_browser_cdms) {
     sources += [
       "media/cdm/browser_cdm_manager.cc",
       "media/cdm/browser_cdm_manager.h",
       "media/media_web_contents_observer.cc",
       "media/media_web_contents_observer.h",
     ]
   }
 }