Consolidate JNI registrations for mojo system.

content/browser/android/browser_jni_registrar.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/browser_jni_registrar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/macros.h"
 #include "content/browser/accessibility/browser_accessibility_android.h"
@@ skipping 14 matching lines @@
 #include "content/browser/android/web_contents_observer_proxy.h"
 #include "content/browser/child_process_launcher_helper_android.h"
 #include "content/browser/frame_host/navigation_controller_android.h"
 #include "content/browser/frame_host/render_frame_host_android.h"
 #include "content/browser/media/session/audio_focus_delegate_android.h"
 #include "content/browser/media/session/media_session_android.h"
 #include "content/browser/memory/memory_monitor_android.h"
 #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[] = {
     {"AppWebMessagePort", content::RegisterAppWebMessagePort},
     {"AudioFocusDelegate", content::AudioFocusDelegateAndroid::Register},
     {"BrowserStartupController", content::RegisterBrowserStartupController},
     {"ChildProcessLauncher", content::RegisterChildProcessLauncher},
     {"ContentFeatureList", content::android::RegisterContentFeatureListJni},
     {"ContentVideoView", content::ContentVideoView::RegisterContentVideoView},
-    {"CoreImpl", mojo::android::RegisterCoreImpl},
     {"GpuProcessCallback", content::RegisterGpuProcessCallback},
     {"MemoryMonitorAndroid", content::MemoryMonitorAndroid::Register},
     {"BackgroundSyncNetworkObserverAndroid",
      content::BackgroundSyncNetworkObserverAndroid::Observer::
          RegisterNetworkObserver},
     {"BrowserAccessibilityManager",
      content::RegisterBrowserAccessibilityManager},
     {"ContentViewCore", content::RegisterContentViewCore},
     {"ContentViewRenderView",
      content::ContentViewRenderView::RegisterContentViewRenderView},
     {"DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid},
     {"InterstitialPageDelegateAndroid",
      content::InterstitialPageDelegateAndroid::
          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},
     {"RenderFrameHostAndroid", content::RenderFrameHostAndroid::Register},
     {"SpeechRecognizerImplAndroid",
      content::SpeechRecognizerImplAndroid::RegisterSpeechRecognizer},
     {"TracingControllerAndroid", content::RegisterTracingControllerAndroid},
-    {"WatcherImpl", mojo::android::RegisterWatcherImpl},
     {"WebContentsAndroid", content::WebContentsAndroid::Register},
     {"WebContentsObserver", content::RegisterWebContentsObserverProxy},
     {"WebViewStatics", content::RegisterWebViewStatics},
 };
 
 }  // namespace
 
 namespace content {
 namespace android {
 
 bool RegisterBrowserJni(JNIEnv* env) {
   return RegisterNativeMethods(env, kContentRegisteredMethods,
                                arraysize(kContentRegisteredMethods));
 }
 
 }  // namespace android
 }  // namespace content