Consolidate JNI registrations for mojo system.

content/public/test/test_utils.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/public/test/test_utils.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 15 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/process_type.h"
 #include "content/public/test/test_launcher.h"
 #include "content/public/test/test_service_manager_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/url_util.h"
 
 #if defined(OS_ANDROID)
 #include "content/browser/android/browser_jni_registrar.h"
+#include "mojo/android/system/mojo_jni_registrar.h"
 #endif
 
 namespace content {
 
 namespace {
 
 // Number of times to repost a Quit task so that the MessageLoop finishes up
 // pending tasks and tasks posted by those pending tasks without risking the
 // potential hang behavior of MessageLoop::QuitWhenIdle.
 // The criteria for choosing this number: it should be high enough to make the
@@ skipping 149 matching lines @@
   command_line->AppendSwitch(switches::kSitePerProcess);
 }
 
 void ResetSchemesAndOriginsWhitelist() {
   url::Shutdown();
   RegisterContentSchemes(false);
   url::Initialize();
 }
 
 #if defined(OS_ANDROID)
-// Registers content/browser JNI bindings necessary for some types of tests.
+// Registers content/browser and mojo JNI bindings necessary for some types of
+// tests.
 bool RegisterJniForTesting(JNIEnv* env) {
-  return content::android::RegisterBrowserJni(env);
+  return mojo::android::RegisterSystemJni(env) &&
+         content::android::RegisterBrowserJni(env);
 }
 #endif
 
 MessageLoopRunner::MessageLoopRunner(QuitMode quit_mode)
     : quit_mode_(quit_mode), loop_running_(false), quit_closure_called_(false) {
 }
 
 MessageLoopRunner::~MessageLoopRunner() = default;
 
 void MessageLoopRunner::Run() {
@@ skipping 170 matching lines @@
 
 void WebContentsDestroyedWatcher::Wait() {
   run_loop_.Run();
 }
 
 void WebContentsDestroyedWatcher::WebContentsDestroyed() {
   run_loop_.Quit();
 }
 
 }  // namespace content