[DeviceService] Expose battery monitoring solely via the Device Service

services/device/battery/battery_status_manager_linux.cc

 // 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.
 
-#include "device/battery/battery_status_manager_linux.h"
+#include "services/device/battery/battery_status_manager_linux.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "dbus/property.h"
 #include "dbus/values_util.h"
-#include "device/battery/battery_status_manager_linux-inl.h"
+#include "services/device/battery/battery_status_manager_linux-inl.h"
 
 namespace device {
 namespace {
 const char kBatteryNotifierThreadName[] = "BatteryStatusNotifier";
 
 class UPowerProperties : public dbus::PropertySet {
  public:
   UPowerProperties(dbus::ObjectProxy* object_proxy,
                    const PropertyChangedCallback callback);
   ~UPowerProperties() override;
@@ skipping 81 matching lines @@
       &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
 
   if (response) {
     dbus::MessageReader reader(response.get());
     reader.PopObjectPath(&display_device_path);
   }
   return display_device_path;
 }
 
 void UpdateNumberBatteriesHistogram(int count) {
-  UMA_HISTOGRAM_CUSTOM_COUNTS(
-      "BatteryStatus.NumberBatteriesLinux", count, 1, 5, 6);
+  UMA_HISTOGRAM_CUSTOM_COUNTS("BatteryStatus.NumberBatteriesLinux", count, 1, 5,
+                              6);
 }
 
 class BatteryProperties : public dbus::PropertySet {
  public:
   BatteryProperties(dbus::ObjectProxy* object_proxy,
                     const PropertyChangedCallback callback);
   ~BatteryProperties() override;
 
   void ConnectSignals() override;
 
@@ skipping 211 matching lines @@
   }
 
   void StopListening() {
     DCHECK(OnWatcherThread());
     ShutdownDBusConnection();
   }
 
   void SetDBusForTesting(dbus::Bus* bus) { system_bus_ = bus; }
 
  private:
-  bool OnWatcherThread() {
-    return task_runner()->BelongsToCurrentThread();
-  }
+  bool OnWatcherThread() { return task_runner()->BelongsToCurrentThread(); }
 
   void InitDBus() {
     DCHECK(OnWatcherThread());
 
     dbus::Bus::Options options;
     options.bus_type = dbus::Bus::SYSTEM;
     options.connection_type = dbus::Bus::PRIVATE;
     system_bus_ = new dbus::Bus(options);
   }
 
   bool IsDaemonVersionBelow_0_99() {
     base::Version daemon_version = upower_->properties()->daemon_version();
     return daemon_version.IsValid() &&
-        daemon_version.CompareTo(base::Version("0.99")) < 0;
+           daemon_version.CompareTo(base::Version("0.99")) < 0;
   }
 
   void FindBatteryDevice() {
     // Move the currently watched battery_ device to a stack-local variable such
     // that we can enumerate all devices (once more):
     // first testing the display device, then testing all devices from
     // EnumerateDevices. We will monitor the first battery device we find.
     // - That may be the same device we did monitor on entering this method;
     //   then we'll use the same BatteryObject instance, that was moved to
     //   current - see UseCurrentOrCreateBattery().
@@ skipping 223 matching lines @@
   return manager;
 }
 
 // static
 std::unique_ptr<BatteryStatusManager> BatteryStatusManager::Create(
     const BatteryStatusService::BatteryUpdateCallback& callback) {
   return base::MakeUnique<BatteryStatusManagerLinux>(callback);
 }
 
 }  // namespace device