| Index: chrome/android/testshell/chrome_main_delegate_testshell_android.cc
|
| diff --git a/chrome/android/testshell/chrome_main_delegate_testshell_android.cc b/chrome/android/testshell/chrome_main_delegate_testshell_android.cc
|
| index e334afc557f91afa9a39cd714328cc5b9d29e7b4..25d6623462b70d0c1490cd390ecd5186a164bfb7 100644
|
| --- a/chrome/android/testshell/chrome_main_delegate_testshell_android.cc
|
| +++ b/chrome/android/testshell/chrome_main_delegate_testshell_android.cc
|
| @@ -5,6 +5,12 @@
|
| #include "chrome/android/testshell/chrome_main_delegate_testshell_android.h"
|
|
|
| #include "base/android/jni_android.h"
|
| +#include "base/android/jni_registrar.h"
|
| +#include "chrome/android/testshell/tab_manager.h"
|
| +
|
| +static base::android::RegistrationMethod kRegistrationMethods[] = {
|
| + { "TabManager", chrome::RegisterTabManager },
|
| +};
|
|
|
| ChromeMainDelegateTestShellAndroid::ChromeMainDelegateTestShellAndroid() {
|
| }
|
| @@ -14,5 +20,10 @@ ChromeMainDelegateTestShellAndroid::~ChromeMainDelegateTestShellAndroid() {
|
|
|
| bool ChromeMainDelegateTestShellAndroid::RegisterApplicationNativeMethods(
|
| JNIEnv* env) {
|
| - return ChromeMainDelegateAndroid::RegisterApplicationNativeMethods(env);
|
| + if (!ChromeMainDelegateAndroid::RegisterApplicationNativeMethods(env))
|
| + return false;
|
| +
|
| + return base::android::RegisterNativeMethods(env,
|
| + kRegistrationMethods,
|
| + arraysize(kRegistrationMethods));
|
| }
|
|
|