| Index: content/shell/browser/shell_mojo_test_utils_android.cc
|
| diff --git a/content/shell/browser/shell_mojo_test_utils_android.cc b/content/shell/browser/shell_mojo_test_utils_android.cc
|
| index 04d3ad6aad92530e7213b6f790f4fa11ddb743e2..ba8f5e98a67c5d0a717bcc8cc0b7cde07d3db1c1 100644
|
| --- a/content/shell/browser/shell_mojo_test_utils_android.cc
|
| +++ b/content/shell/browser/shell_mojo_test_utils_android.cc
|
| @@ -23,19 +23,20 @@ struct TestEnvironment {
|
|
|
| namespace content {
|
|
|
| -static jlong SetupTestEnvironment(JNIEnv* env, jclass jcaller) {
|
| +static jlong SetupTestEnvironment(JNIEnv* env,
|
| + const JavaParamRef<jclass>& jcaller) {
|
| return reinterpret_cast<intptr_t>(new TestEnvironment());
|
| }
|
|
|
| static void TearDownTestEnvironment(JNIEnv* env,
|
| - jclass jcaller,
|
| + const JavaParamRef<jclass>& jcaller,
|
| jlong test_environment) {
|
| delete reinterpret_cast<TestEnvironment*>(test_environment);
|
| }
|
|
|
| static ScopedJavaLocalRef<jobject> CreateServiceRegistryPair(
|
| JNIEnv* env,
|
| - jclass jcaller,
|
| + const JavaParamRef<jclass>& jcaller,
|
| jlong native_test_environment) {
|
| TestEnvironment* test_environment =
|
| reinterpret_cast<TestEnvironment*>(native_test_environment);
|
| @@ -64,7 +65,9 @@ static ScopedJavaLocalRef<jobject> CreateServiceRegistryPair(
|
| wrapper_b->GetObj().obj());
|
| }
|
|
|
| -static void RunLoop(JNIEnv* env, jclass jcaller, jlong timeout_ms) {
|
| +static void RunLoop(JNIEnv* env,
|
| + const JavaParamRef<jclass>& jcaller,
|
| + jlong timeout_ms) {
|
| base::MessageLoop::current()->PostDelayedTask(
|
| FROM_HERE,
|
| base::MessageLoop::QuitClosure(),
|
|
|