summaryrefslogtreecommitdiffstats
path: root/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc')
-rw-r--r--content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc b/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc
index 26f93d4..8379008 100644
--- a/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc
+++ b/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc
@@ -2,21 +2,23 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/android/base_jni_registrar.h"
#include "base/android/jni_android.h"
#include "base/bind.h"
#include "content/public/app/content_jni_onload.h"
#include "content/public/app/content_main.h"
#include "content/public/test/nested_message_pump_android.h"
-#include "content/shell/android/browsertests_apk/content_browser_tests_android.h"
#include "content/shell/android/shell_jni_registrar.h"
#include "content/shell/app/shell_main_delegate.h"
+#include "testing/android/native_test/native_test_launcher.h"
namespace {
bool RegisterJNI(JNIEnv* env) {
- return content::android::RegisterShellJni(env) &&
+ return base::android::RegisterJni(env) &&
+ content::android::RegisterShellJni(env) &&
content::NestedMessagePumpAndroid::RegisterJni(env) &&
- content::RegisterContentBrowserTestsAndroid(env);
+ testing::android::RegisterNativeTestJNI(env);
}
bool Init() {