Consolidate JNI registrations for mojo system.

content/browser/android/browser_jni_registrar.cc

Index: content/browser/android/browser_jni_registrar.cc
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc
index 056656dd29ad74444016d804ec2e0c9d6fb0da79..bcdb97f5b261f5e9e4d0cc2627cce83cc7d7984c 100644
--- a/content/browser/android/browser_jni_registrar.cc
+++ b/content/browser/android/browser_jni_registrar.cc
@@ -32,8 +32,7 @@
 #include "content/browser/renderer_host/ime_adapter_android.h"
 #include "content/browser/speech/speech_recognizer_impl_android.h"
 #include "content/browser/web_contents/web_contents_android.h"
-#include "mojo/android/system/core_impl.h"
-#include "mojo/android/system/watcher_impl.h"
+#include "mojo/android/system/mojo_jni_registrar.h"
 
 namespace {
 base::android::RegistrationMethod kContentRegisteredMethods[] = {
@@ -43,7 +42,6 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
     {"ChildProcessLauncher", content::RegisterChildProcessLauncher},
     {"ContentFeatureList", content::android::RegisterContentFeatureListJni},
     {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView},
-    {"CoreImpl", mojo::android::RegisterCoreImpl},
     {"GpuProcessCallback", content::RegisterGpuProcessCallback},
     {"MemoryMonitorAndroid", content::MemoryMonitorAndroid::Register},
     {"BackgroundSyncNetworkObserverAndroid",
@@ -60,6 +58,7 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
          RegisterInterstitialPageDelegateAndroid},
     {"LoadUrlParams", content::RegisterLoadUrlParams},
     {"MediaSessionImpl", content::MediaSessionAndroid::Register},
+    {"MojoSystem", mojo::android::RegisterSystemJni},

[blundell, 2017/03/29 17:31:57]

nit: Instead of being in this list, this should be called at all the callsites
of RegisterBrowserJni(), right?

[leonhsl(Using Gerrit), 2017/03/30 08:04:14]

The mojo system JNI is necessary to functions in
content/browser/android/java_interfaces_impl.cc, so I suppose we'd better still
keep mojo JNI registration here? 
Some callsites of RegisterBrowserJni() may have no direct need to mojo JNI by
themselves, if we let them register mojo JNI, seems somehow unnatural.. Or I'm
missing some other rules that we should do that way? Thanks!

     {"NavigationControllerAndroid",
      content::NavigationControllerAndroid::Register},
     {"RegisterImeAdapter", content::RegisterImeAdapter},
@@ -67,7 +66,6 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
     {"SpeechRecognizerImplAndroid",
      content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer},
     {"TracingControllerAndroid", content::RegisterTracingControllerAndroid},
-    {"WatcherImpl", mojo::android::RegisterWatcherImpl},
     {"WebContentsAndroid", content::WebContentsAndroid::Register},
     {"WebContentsObserver", content::RegisterWebContentsObserverProxy},
     {"WebViewStatics", content::RegisterWebViewStatics},