[DeviceService] Expose battery monitoring solely via the Device Service

device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorFactory.java

Index: device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorFactory.java
diff --git a/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorFactory.java b/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorFactory.java
deleted file mode 100644
index 70a26cdfb16507f52185f172f93919e71f992682..0000000000000000000000000000000000000000
--- a/device/battery/android/java/src/org/chromium/device/battery/BatteryMonitorFactory.java
+++ /dev/null
@@ -1,74 +0,0 @@
-// 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.
-
-package org.chromium.device.battery;
-
-import android.content.Context;
-import android.util.Log;
-
-import org.chromium.base.ThreadUtils;
-import org.chromium.device.battery.BatteryStatusManager.BatteryStatusCallback;
-import org.chromium.device.mojom.BatteryMonitor;
-import org.chromium.device.mojom.BatteryStatus;
-import org.chromium.services.service_manager.InterfaceFactory;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-/**
- * Factory that creates instances of BatteryMonitor implementations and notifies them about battery
- * status changes.
- */
-public class BatteryMonitorFactory implements InterfaceFactory<BatteryMonitor> {
-    static final String TAG = "BatteryMonitorFactory";
-
-    // Backing source of battery information.
-    private final BatteryStatusManager mManager;
-    // Monitors currently interested in the battery status notifications.
-    private final HashSet<BatteryMonitorImpl> mSubscribedMonitors =
-            new HashSet<BatteryMonitorImpl>();
-
-    private final BatteryStatusCallback mCallback = new BatteryStatusCallback() {
-        @Override
-        public void onBatteryStatusChanged(BatteryStatus batteryStatus) {
-            ThreadUtils.assertOnUiThread();
-
-            List<BatteryMonitorImpl> monitors = new ArrayList<>(mSubscribedMonitors);
-            for (BatteryMonitorImpl monitor : monitors) {
-                monitor.didChange(batteryStatus);
-            }
-        }
-    };
-
-    public BatteryMonitorFactory(Context applicationContext) {
-        assert applicationContext != null;
-        mManager = new BatteryStatusManager(applicationContext, mCallback);
-    }
-
-    @Override
-    public BatteryMonitor createImpl() {
-        ThreadUtils.assertOnUiThread();
-
-        if (mSubscribedMonitors.isEmpty() && !mManager.start()) {
-            Log.e(TAG, "BatteryStatusManager failed to start.");
-        }
-        // TODO(ppi): record the "BatteryStatus.StartAndroid" histogram here once we have a Java API
-        //            for UMA - http://crbug.com/442300.
-
-        BatteryMonitorImpl monitor = new BatteryMonitorImpl(this);
-        mSubscribedMonitors.add(monitor);
-        return monitor;
-    }
-
-    void unsubscribe(BatteryMonitorImpl monitor) {
-        ThreadUtils.assertOnUiThread();
-
-        assert mSubscribedMonitors.contains(monitor);
-        mSubscribedMonitors.remove(monitor);
-        if (mSubscribedMonitors.isEmpty()) {
-            mManager.stop();
-        }
-    }
-}