Revert of Move registration of Java mojo interfaces to the new InterfaceRegistrar.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index fabbc705766ade3e912a80cc0d3e1adad7247fc3..2d05c1bd01f019db1fba69e05af2893ca1ccff12 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -177,11 +177,8 @@
 #include "net/cookies/cookie_options.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ppapi/host/ppapi_host.h"
-#include "services/shell/public/cpp/interface_provider.h"
 #include "services/shell/public/cpp/service.h"
 #include "storage/browser/fileapi/external_mount_points.h"
-#include "third_party/WebKit/public/platform/modules/payments/payment_request.mojom.h"
-#include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
@@ -234,10 +231,10 @@
 #endif
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
+#include "chrome/browser/android/mojo/chrome_interface_registrar_android.h"
 #include "chrome/browser/android/ntp/new_tab_page_url_handler.h"
 #include "chrome/browser/android/service_tab_launcher.h"
 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
-#include "content/public/browser/android/java_interfaces.h"
 #endif
 
 #if defined(OS_ANDROID)
@@ -2949,16 +2946,8 @@
                  render_frame_host));
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
-  content::WebContents* web_contents =
-      content::WebContents::FromRenderFrameHost(render_frame_host);
-  if (web_contents) {
-    registry->AddInterface(
-        web_contents->GetJavaInterfaces()
-            ->CreateInterfaceFactory<blink::mojom::PaymentRequest>());
-    registry->AddInterface(
-        web_contents->GetJavaInterfaces()
-            ->CreateInterfaceFactory<blink::mojom::ShareService>());
-  }
+  ChromeInterfaceRegistrarAndroid::ExposeInterfacesToFrame(
+      registry, render_frame_host);
 #endif
 }