Rewrite the Android implementation of BatteryMonitor directly in Java.

content/shell/browser/shell_mojo_test_utils_android.cc

Index: content/shell/browser/shell_mojo_test_utils_android.cc
diff --git a/content/shell/browser/shell_mojo_test_utils_android.cc b/content/shell/browser/shell_mojo_test_utils_android.cc
index 9ca5a66f264127f289d37d2aca17199cdfb1c1b1..eeae444a01637e26660467acb00667db83a7e0b1 100644
--- a/content/shell/browser/shell_mojo_test_utils_android.cc
+++ b/content/shell/browser/shell_mojo_test_utils_android.cc
@@ -57,10 +57,8 @@ static jobject CreateServiceRegistryPair(JNIEnv* env,
       new ServiceRegistryAndroid(registry_b);
   test_environment->wrappers.push_back(wrapper_b);
 
-  return Java_ShellMojoTestUtils_makePair(env,
-                                          wrapper_a->GetObjForTesting().obj(),
-                                          wrapper_b->GetObjForTesting().obj())
-      .Release();
+  return Java_ShellMojoTestUtils_makePair(env, wrapper_a->GetObj().obj(),
+                                          wrapper_b->GetObj().obj()).Release();
 }
 
 static void RunLoop(JNIEnv* env, jclass jcaller, jlong timeout_ms) {