Consolidate JNI registrations for mojo system.

content/public/test/test_utils.cc

Index: content/public/test/test_utils.cc
diff --git a/content/public/test/test_utils.cc b/content/public/test/test_utils.cc
index 4afe2321e9f3f4c021831dc3857db3582e9991a7..1f53ee1828c283491400ed821819a46832702399 100644
--- a/content/public/test/test_utils.cc
+++ b/content/public/test/test_utils.cc
@@ -33,6 +33,7 @@
 
 #if defined(OS_ANDROID)
 #include "content/browser/android/browser_jni_registrar.h"
+#include "mojo/android/system/mojo_jni_registrar.h"
 #endif
 
 namespace content {
@@ -202,9 +203,11 @@ void ResetSchemesAndOriginsWhitelist() {
 }
 
 #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