Split ServiceRegistryAndroid into InterfaceRegistryAndroid and InterfaceProviderAndroid

content/public/android/BUILD.gn

Index: content/public/android/BUILD.gn
diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
index 860a0625c0c141a740dae1bf9e644b043aaa6696..64fd9af24f429e0ab15a94769b946aa8d3e6c5c9 100644
--- a/content/public/android/BUILD.gn
+++ b/content/public/android/BUILD.gn
@@ -121,6 +121,9 @@ android_library("content_java") {
     "java/src/org/chromium/content/browser/DeviceUtils.java",
     "java/src/org/chromium/content/browser/FileDescriptorInfo.java",
     "java/src/org/chromium/content/browser/FloatingWebActionModeCallback.java",
+    "java/src/org/chromium/content/browser/InterfaceProvider.java",
+    "java/src/org/chromium/content/browser/InterfaceRegistrar.java",
+    "java/src/org/chromium/content/browser/InterfaceRegistry.java",
     "java/src/org/chromium/content/browser/InterstitialPageDelegateAndroid.java",
     "java/src/org/chromium/content/browser/JavascriptInterface.java",
     "java/src/org/chromium/content/browser/MediaResourceGetter.java",
@@ -135,8 +138,6 @@ android_library("content_java") {
     "java/src/org/chromium/content/browser/SPenSupport.java",
     "java/src/org/chromium/content/browser/ScreenOrientationListener.java",
     "java/src/org/chromium/content/browser/ScreenOrientationProvider.java",
-    "java/src/org/chromium/content/browser/ServiceRegistrar.java",
-    "java/src/org/chromium/content/browser/ServiceRegistry.java",
     "java/src/org/chromium/content/browser/SmartClipProvider.java",
     "java/src/org/chromium/content/browser/SpeechRecognition.java",
     "java/src/org/chromium/content/browser/TimeZoneMonitor.java",
@@ -342,6 +343,7 @@ android_library("content_javatests") {
     "javatests/src/org/chromium/content/browser/EncodeHtmlDataUriTest.java",
     "javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java",
     "javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java",
+    "javatests/src/org/chromium/content/browser/InterfaceRegistryTest.java",
     "javatests/src/org/chromium/content/browser/InterstitialPageTest.java",
     "javatests/src/org/chromium/content/browser/JavaBridgeArrayCoercionTest.java",
     "javatests/src/org/chromium/content/browser/JavaBridgeArrayTest.java",
@@ -360,7 +362,6 @@ android_library("content_javatests") {
     "javatests/src/org/chromium/content/browser/PopupZoomerTest.java",
     "javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java",
     "javatests/src/org/chromium/content/browser/ScreenOrientationProviderTest.java",
-    "javatests/src/org/chromium/content/browser/ServiceRegistryTest.java",
     "javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.java",
     "javatests/src/org/chromium/content/browser/TracingControllerAndroidTest.java",
     "javatests/src/org/chromium/content/browser/VSyncMonitorTest.java",