Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Side by Side Diff: components/test/android/browsertests_apk/components_browser_tests_jni_onload.cc

Issue 2146753002: Android: Remove unneeded RegisterNatives() calls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android: Don't require RegisterNatives if there are none Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/android/base_jni_registrar.h" 5 #include "base/android/base_jni_registrar.h"
6 #include "base/android/jni_android.h" 6 #include "base/android/jni_android.h"
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "content/public/app/content_jni_onload.h" 8 #include "content/public/app/content_jni_onload.h"
9 #include "content/public/app/content_main.h" 9 #include "content/public/app/content_main.h"
10 #include "content/public/test/nested_message_pump_android.h"
11 #include "content/shell/android/shell_jni_registrar.h" 10 #include "content/shell/android/shell_jni_registrar.h"
12 #include "content/shell/app/shell_main_delegate.h" 11 #include "content/shell/app/shell_main_delegate.h"
13 #include "testing/android/native_test/native_test_launcher.h" 12 #include "testing/android/native_test/native_test_launcher.h"
14 13
15 namespace { 14 namespace {
16 15
17 bool RegisterJNI(JNIEnv* env) { 16 bool RegisterJNI(JNIEnv* env) {
18 return base::android::RegisterJni(env) && 17 return base::android::RegisterJni(env) &&
19 content::android::RegisterShellJni(env) && 18 content::android::RegisterShellJni(env) &&
20 content::NestedMessagePumpAndroid::RegisterJni(env) &&
21 testing::android::RegisterNativeTestJNI(env); 19 testing::android::RegisterNativeTestJNI(env);
22 } 20 }
23 21
24 bool Init() { 22 bool Init() {
25 content::SetContentMainDelegate(new content::ShellMainDelegate()); 23 content::SetContentMainDelegate(new content::ShellMainDelegate());
26 return true; 24 return true;
27 } 25 }
28 26
29 } // namespace 27 } // namespace
30 28
31 // This is called by the VM when the shared library is first loaded. 29 // This is called by the VM when the shared library is first loaded.
32 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 30 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
33 std::vector<base::android::RegisterCallback> register_callbacks; 31 std::vector<base::android::RegisterCallback> register_callbacks;
34 register_callbacks.push_back(base::Bind(&RegisterJNI)); 32 register_callbacks.push_back(base::Bind(&RegisterJNI));
35 std::vector<base::android::InitCallback> init_callbacks; 33 std::vector<base::android::InitCallback> init_callbacks;
36 init_callbacks.push_back(base::Bind(&Init)); 34 init_callbacks.push_back(base::Bind(&Init));
37 if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || 35 if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
38 !content::android::OnJNIOnLoadInit(init_callbacks)) { 36 !content::android::OnJNIOnLoadInit(init_callbacks)) {
39 return -1; 37 return -1;
40 } 38 }
41 return JNI_VERSION_1_4; 39 return JNI_VERSION_1_4;
42 } 40 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698