Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79.

shell/android/main.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "shell/android/main.h"
 
 #include <stdio.h>
 
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.h"
@@ skipping 243 matching lines @@
   // Setting the TMPDIR and HOME environment variables so that applications can
   // use it.
   // TODO(qsr) We will need our subprocesses to inherit this.
   int return_value = setenv("TMPDIR", tmp_dir.c_str(), 1);
   DCHECK_EQ(return_value, 0);
   return_value = setenv(
       "HOME", base::android::ConvertJavaStringToUTF8(env, j_home_dir).c_str(),
       1);
   DCHECK_EQ(return_value, 0);
 
-  base::android::ScopedJavaLocalRef<jobject> scoped_application_context(
-      env, application_context);
-  base::android::InitApplicationContext(env, scoped_application_context);
+  base::android::InitApplicationContext(env, application_context);
 
   std::vector<std::string> parameters;
   parameters.push_back("mojo_shell");
   base::android::AppendJavaStringArrayToStringVector(env, jparameters,
                                                      &parameters);
   base::CommandLine::Init(0, nullptr);
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   command_line->InitFromArgv(parameters);
 
   base::FilePath dumps_path = base::FilePath(tmp_dir).Append("breakpad_dumps");
@@ skipping 82 matching lines @@
 static void QuitShell(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
   g_internal_data.Get().shell_task_runner->PostTask(
       FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
 }
 
 bool RegisterShellService(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace shell