Rewrite the Android implementation of BatteryMonitor directly in Java.

content/shell/browser/shell_mojo_test_utils_android.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 "content/shell/browser/shell_mojo_test_utils_android.h"
 
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "content/browser/mojo/service_registry_android.h"
@@ skipping 39 matching lines @@
   registry_a->BindRemoteServiceProvider(handle_a.Pass());
   registry_b->BindRemoteServiceProvider(handle_b.Pass());
 
   content::ServiceRegistryAndroid* wrapper_a =
       new ServiceRegistryAndroid(registry_a);
   test_environment->wrappers.push_back(wrapper_a);
   content::ServiceRegistryAndroid* wrapper_b =
       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) {
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::MessageLoop::QuitClosure(),
       base::TimeDelta::FromMilliseconds(timeout_ms));
   base::RunLoop run_loop;
   run_loop.Run();
 }
 
 bool RegisterShellMojoTestUtils(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content