[Android] Add nullable dependency to BatteryStatusManager.java

Add use of Nullable annotation and the dependency in BUILD.gn to make it compile on android_chromium_gn bots.

BUG=

Review URL: https://codereview.chromium.org/942923003

Cr-Commit-Position: refs/heads/master@{#319279}

2 files changed, 5 insertions, 2 deletions

diff --git a/device/battery/android/BUILD.gn b/device/battery/android/BUILD.gn
index b156122..503a10c 100644
--- a/device/battery/android/BUILD.gn
+++ b/device/battery/android/BUILD.gn
@@ -15,6 +15,7 @@ android_library("battery_monitor_android") {
   deps = [
     "//base:base_java",
     "//device/battery:mojo_bindings_java",
+    "//third_party/jsr-305:jsr_305_javalib",
     "//third_party/mojo/src/mojo/public/java:bindings",
     "//third_party/mojo/src/mojo/public/java:system",
   ]
diff --git a/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java b/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java
index 87fd280..8d62538 100644
--- a/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java
+++ b/device/battery/android/java/src/org/chromium/device/battery/BatteryStatusManager.java
@@ -16,6 +16,8 @@ import android.util.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.mojom.device.BatteryStatus;
 
+import javax.annotation.Nullable;
+
 /**
  * Data source for battery status information. This class registers for battery status notifications
  * from the system and calls the callback passed on construction whenever a notification is
@@ -50,7 +52,7 @@ class BatteryStatusManager {
 
     private BatteryStatusManager(
             Context context, BatteryStatusCallback callback, boolean ignoreBatteryPresentState,
-            BatteryManager batteryManager) {
+            @Nullable BatteryManager batteryManager) {
         mAppContext = context.getApplicationContext();
         mCallback = callback;
         mIgnoreBatteryPresentState = ignoreBatteryPresentState;
@@ -72,7 +74,7 @@ class BatteryStatusManager {
     static BatteryStatusManager createBatteryStatusManagerForTesting(
             Context context,
             BatteryStatusCallback callback,
-            BatteryManager batteryManager) {
+            @Nullable BatteryManager batteryManager) {
         return new BatteryStatusManager(context, callback, false, batteryManager);
     }