Android: Allow duplicate calls to InitApplicationContext.

mojo/shell/android/mojo_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 "mojo/shell/android/mojo_main.h"
 
 #include "base/android/jni_string.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 34 matching lines @@
 void StartOnShellThread() {
   g_context.Get().reset(new shell::Context());
   shell::Run(g_context.Get().get());
 }
 
 }  // namspace
 
 static void Init(JNIEnv* env, jclass clazz, jobject context) {
   base::android::ScopedJavaLocalRef<jobject> scoped_context(env, context);
 
-  base::android::InitApplicationContext(scoped_context);
+  base::android::InitApplicationContext(env, scoped_context);
 
   if (g_at_exit)
     return;
   g_at_exit = new base::AtExitManager();
   // TODO(abarth): Currently we leak g_at_exit.
 
   CommandLine::Init(0, 0);
   InitializeLogging();
 
   // TODO(abarth): At which point should we switch to cross-platform
@@ skipping 17 matching lines @@
       base::Bind(StartOnShellThread));
 
   // TODO(abarth): Currently we leak g_shell_thread.
 }
 
 bool RegisterMojoMain(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace mojo