| Index: mojo/runner/android/main.cc
 | 
| diff --git a/mojo/runner/android/main.cc b/mojo/runner/android/main.cc
 | 
| index 8f4db82ffc2cbebbd69aacef3cf8e7ac380b22d0..b5717cca784c63495f2e58aa454a2378a6b21ba4 100644
 | 
| --- a/mojo/runner/android/main.cc
 | 
| +++ b/mojo/runner/android/main.cc
 | 
| @@ -99,12 +99,12 @@ void InitializeRedirection() {
 | 
|  }  // namespace
 | 
|  
 | 
|  static void Init(JNIEnv* env,
 | 
| -                 jclass clazz,
 | 
| -                 jobject activity,
 | 
| -                 jstring mojo_shell_path,
 | 
| -                 jobjectArray jparameters,
 | 
| -                 jstring j_local_apps_directory,
 | 
| -                 jstring j_tmp_dir) {
 | 
| +                 const JavaParamRef<jclass>& clazz,
 | 
| +                 const JavaParamRef<jobject>& activity,
 | 
| +                 const JavaParamRef<jstring>& mojo_shell_path,
 | 
| +                 const JavaParamRef<jobjectArray>& jparameters,
 | 
| +                 const JavaParamRef<jstring>& j_local_apps_directory,
 | 
| +                 const JavaParamRef<jstring>& j_tmp_dir) {
 | 
|    g_main_activiy.Get().Reset(env, activity);
 | 
|  
 | 
|    // Setting the TMPDIR environment variable so that applications can use it.
 | 
| @@ -155,7 +155,7 @@ static void Init(JNIEnv* env,
 | 
|    gfx::GLSurface::InitializeOneOff();
 | 
|  }
 | 
|  
 | 
| -static void Start(JNIEnv* env, jclass clazz) {
 | 
| +static void Start(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
 | 
|  #if defined(MOJO_SHELL_DEBUG_URL)
 | 
|    base::CommandLine::ForCurrentProcess()->AppendArg(MOJO_SHELL_DEBUG_URL);
 | 
|    // Sleep for 5 seconds to give the debugger a chance to attach.
 | 
| @@ -166,7 +166,9 @@ static void Start(JNIEnv* env, jclass clazz) {
 | 
|    context->RunCommandLineApplication(base::Bind(ExitShell));
 | 
|  }
 | 
|  
 | 
| -static void AddApplicationURL(JNIEnv* env, jclass clazz, jstring jurl) {
 | 
| +static void AddApplicationURL(JNIEnv* env,
 | 
| +                              const JavaParamRef<jclass>& clazz,
 | 
| +                              const JavaParamRef<jstring>& jurl) {
 | 
|    base::CommandLine::ForCurrentProcess()->AppendArg(
 | 
|        base::android::ConvertJavaStringToUTF8(env, jurl));
 | 
|  }
 | 
| 
 |