Have mojo_shell run in its custom thread on android.

mojo/shell/context.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/context.h"
 
 #include "build/build_config.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_vector.h"
 #include "mojo/embedder/embedder.h"
 #include "mojo/gles2/gles2_support_impl.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/service_manager/background_service_loader.h"
 #include "mojo/service_manager/service_loader.h"
 #include "mojo/service_manager/service_manager.h"
 #include "mojo/services/native_viewport/native_viewport_service.h"
 #include "mojo/shell/dynamic_service_loader.h"
 #include "mojo/shell/in_process_dynamic_service_runner.h"
 #include "mojo/shell/out_of_process_dynamic_service_runner.h"
 #include "mojo/shell/switches.h"
+#include "mojo/shell/ui_service_loader_android.h"
 #include "mojo/spy/spy.h"
 
 #if defined(OS_LINUX)
 #include "mojo/shell/dbus_service_loader_linux.h"
 #endif  // defined(OS_LINUX)
 
 #if defined(OS_ANDROID)
 #include "mojo/shell/network_service_loader.h"
 #endif  // defined(OS_ANDROID)
 
@@ skipping 64 matching lines @@
     runner_factory.reset(new OutOfProcessDynamicServiceRunnerFactory());
   else
     runner_factory.reset(new InProcessDynamicServiceRunnerFactory());
 
   service_manager_.set_default_loader(
       scoped_ptr<ServiceLoader>(
           new DynamicServiceLoader(this, runner_factory.Pass())));
   // The native viewport service synchronously waits for certain messages. If we
   // don't run it on its own thread we can easily deadlock. Long term native
   // viewport should run its own process so that this isn't an issue.
+#if defined(OS_ANDROID)
+  service_manager_.SetLoaderForURL(
+      scoped_ptr<ServiceLoader>(
+          new UIServiceLoader(
+              scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader(this)),
+              this)),
+      GURL("mojo:mojo_native_viewport_service"));
+#else
   service_manager_.SetLoaderForURL(
       scoped_ptr<ServiceLoader>(
           new BackgroundServiceLoader(
               scoped_ptr<ServiceLoader>(new NativeViewportServiceLoader(this)),
               "native_viewport",
               base::MessageLoop::TYPE_UI)),
       GURL("mojo:mojo_native_viewport_service"));
+#endif
 #if defined(USE_AURA)
   // TODO(sky): need a better way to find this. It shouldn't be linked in.
   service_manager_.SetLoaderForURL(
       scoped_ptr<ServiceLoader>(new ViewManagerLoader()),
       GURL("mojo:mojo_view_manager"));
 #endif
 
 #if defined(OS_LINUX)
   service_manager_.SetLoaderForScheme(
       scoped_ptr<ServiceLoader>(new DBusServiceLoader(this)),
@@ skipping 25 matching lines @@
 #if defined(USE_AURA)
   service_manager_.SetLoaderForURL(
       scoped_ptr<ServiceLoader>(),
       GURL("mojo:mojo_view_manager"));
 #endif
   service_manager_.set_default_loader(scoped_ptr<ServiceLoader>());
 }
 
 }  // namespace shell
 }  // namespace mojo