Move registration of Java mojo interfaces to the new InterfaceRegistrar.

chrome/browser/android/mojo/chrome_interface_registrar_android.cc

Index: chrome/browser/android/mojo/chrome_interface_registrar_android.cc
diff --git a/chrome/browser/android/mojo/chrome_interface_registrar_android.cc b/chrome/browser/android/mojo/chrome_interface_registrar_android.cc
index f0cc1dcc1b913df128df9d0360da487952359bfc..78d502067e872f0092dc80e8afea183a2afdb589 100644
--- a/chrome/browser/android/mojo/chrome_interface_registrar_android.cc
+++ b/chrome/browser/android/mojo/chrome_interface_registrar_android.cc
@@ -4,26 +4,13 @@
 
 #include "chrome/browser/android/mojo/chrome_interface_registrar_android.h"
 
+#include <jni.h>
+
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
-#include "content/public/browser/android/interface_registry_android.h"
-#include "content/public/browser/web_contents.h"
 #include "jni/ChromeInterfaceRegistrar_jni.h"
-#include "services/shell/public/cpp/interface_registry.h"
-
-// static
-void ChromeInterfaceRegistrarAndroid::ExposeInterfacesToFrame(
-    shell::InterfaceRegistry* registry,
-    content::RenderFrameHost* render_frame_host) {
-  content::WebContents* web_contents =
-      content::WebContents::FromRenderFrameHost(render_frame_host);
-
-  // Happens when, for example, showing the malware interstitial page.
-  if (!web_contents)
-    return;
 
-  Java_ChromeInterfaceRegistrar_exposeInterfacesToFrame(
-      base::android::AttachCurrentThread(),
-      content::InterfaceRegistryAndroid::Create(registry)->GetObj(),
-      web_contents->GetJavaWebContents());
+void RegisterChromeJavaMojoInterfaces() {
+  Java_ChromeInterfaceRegistrar_registerMojoInterfaces(
+      base::android::AttachCurrentThread());
 }