Move registration of Java mojo interfaces to the new InterfaceRegistrar.

content/browser/renderer_host/render_process_host_impl.cc

Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 86542396b12f3788cac8e74a7c60eb6dc33552e5..78e6dc9a56d69f48963fef625055fd68d337ca97 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -196,6 +196,7 @@
 #include "content/browser/media/android/browser_demuxer_android.h"
 #include "content/browser/mojo/interface_registrar_android.h"
 #include "content/browser/screen_orientation/screen_orientation_message_filter_android.h"
+#include "content/public/browser/android/java_interfaces.h"
 #include "ipc/ipc_sync_channel.h"
 #include "media/audio/android/audio_manager_android.h"
 #endif
@@ -1229,7 +1230,11 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {
       base::Bind(&RenderProcessHostImpl::OnRouteProviderRequest,
                  base::Unretained(this)));
 
-#if !defined(OS_ANDROID)
+#if defined(OS_ANDROID)
+  AddUIThreadInterface(registry.get(),
+                       GetGlobalJavaInterfaces()
+                           ->CreateInterfaceFactory<device::BatteryMonitor>());
+#else
   AddUIThreadInterface(
       registry.get(), base::Bind(&device::BatteryMonitorImpl::Create));
 #endif