Android: decouple mojo shell from the network service.

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 "shell/android/mojo_main.h"
 
 #include "base/android/command_line_android.h"
 #include "base/android/java_handler_thread.h"
+#include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "jni/MojoMain_jni.h"
 #include "mojo/application_manager/application_loader.h"
@@ skipping 24 matching lines @@
        it != app_urls.end(); ++it) {
     context->Run(*it);
   }
 }
 
 }  // namespace
 
 static void Init(JNIEnv* env,
                  jclass clazz,
                  jobject context,
-                 jobjectArray jparameters) {
+                 jobjectArray jparameters,
+                 jstring j_local_apps_directory) {
   base::android::ScopedJavaLocalRef<jobject> scoped_context(env, context);
-
   base::android::InitApplicationContext(env, scoped_context);
 
   base::android::InitNativeCommandLineFromJavaArray(env, jparameters);
   mojo::shell::InitializeLogging();
 
   // We want ~MessageLoop to happen prior to ~Context. Initializing
   // LazyInstances is akin to stack-allocating objects; their destructors
   // will be invoked first-in-last-out.
   shell::Context* shell_context = new shell::Context();
+  shell_context->mojo_url_resolver()->SetLocalAppsPath(base::FilePath(
+      base::android::ConvertJavaStringToUTF8(env, j_local_apps_directory)));
   g_context.Get().reset(shell_context);
+
   g_java_message_loop.Get().reset(new base::MessageLoopForUI);
   base::MessageLoopForUI::current()->Start();
 
   // TODO(abarth): At which point should we switch to cross-platform
   // initialization?
 
   gfx::GLSurface::InitializeOneOff();
 }
 
 static void Start(JNIEnv* env, jclass clazz, jstring jurl) {
@@ skipping 12 matching lines @@
   g_shell_thread.Get()->Start();
   g_shell_thread.Get()->message_loop()->PostTask(
       FROM_HERE, base::Bind(&RunShell, app_urls));
 }
 
 bool RegisterMojoMain(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace mojo