[DeviceService] Expose battery monitoring solely via the Device Service

services/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java

Index: services/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java
diff --git a/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java b/services/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java
similarity index 95%
rename from device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java
rename to services/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java
index 7db86e18fe0927f7949d34221933dc03353d89c8..bd7a4699ed68f33810b73a03afa3b0af53be9aae 100644
--- a/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java
+++ b/services/device/battery/android/javatests/src/org/chromium/device/battery/BatteryStatusManagerTest.java
@@ -24,14 +24,14 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
 
     private BatteryStatusManager.BatteryStatusCallback mCallback =
             new BatteryStatusManager.BatteryStatusCallback() {
-        @Override
-        public void onBatteryStatusChanged(BatteryStatus batteryStatus) {
-            mCharging = batteryStatus.charging;
-            mChargingTime = batteryStatus.chargingTime;
-            mDischargingTime = batteryStatus.dischargingTime;
-            mLevel = batteryStatus.level;
-        }
-    };
+                @Override
+                public void onBatteryStatusChanged(BatteryStatus batteryStatus) {
+                    mCharging = batteryStatus.charging;
+                    mChargingTime = batteryStatus.chargingTime;
+                    mDischargingTime = batteryStatus.dischargingTime;
+                    mLevel = batteryStatus.level;
+                }
+            };
 
     private BatteryStatusManager mManager;
 
@@ -55,8 +55,8 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
 
         @Override
         public int getIntProperty(int id) {
-            switch(id) {
-                case BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER :
+            switch (id) {
+                case BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER:
                     return mChargeCounter;
                 case BatteryManager.BATTERY_PROPERTY_CAPACITY:
                     return mCapacity;
@@ -68,8 +68,8 @@ public class BatteryStatusManagerTest extends AndroidTestCase {
         }
 
         public FakeAndroidBatteryManager setIntProperty(int id, int value) {
-            switch(id) {
-                case BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER :
+            switch (id) {
+                case BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER:
                     mChargeCounter = value;
                     return this;
                 case BatteryManager.BATTERY_PROPERTY_CAPACITY: