Revert of Mandoline UI Process: Update namespaces and file names

mojo/runner/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 "mojo/runner/android/main.h"
 
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
@@ skipping 38 matching lines @@
 LazyInstance<scoped_ptr<base::MessageLoop>> g_java_message_loop =
     LAZY_INSTANCE_INITIALIZER;
 
 LazyInstance<scoped_ptr<Context>> g_context = LAZY_INSTANCE_INITIALIZER;
 
 LazyInstance<base::android::ScopedJavaGlobalRef<jobject>> g_main_activiy =
     LAZY_INSTANCE_INITIALIZER;
 
 void ConfigureAndroidServices(Context* context) {
   context->application_manager()->SetLoaderForURL(
-      make_scoped_ptr(
-          new UIApplicationLoader(make_scoped_ptr(new mus::AndroidLoader()),
-                                  g_java_message_loop.Get().get())),
+      make_scoped_ptr(new UIApplicationLoader(
+          make_scoped_ptr(new view_manager::AndroidLoader()),
+          g_java_message_loop.Get().get())),
       GURL("mojo:mus"));
 
   // Android handler is bundled with the Mojo shell, because it uses the
   // MojoShell application as the JNI bridge to bootstrap execution of other
   // Android Mojo apps that need JNI.
   context->application_manager()->SetLoaderForURL(
       make_scoped_ptr(new BackgroundApplicationLoader(
           make_scoped_ptr(new AndroidHandlerLoader()), "android_handler",
           base::MessageLoop::TYPE_DEFAULT)),
       GURL("mojo:android_handler"));
@@ skipping 115 matching lines @@
   base::AtExitManager at_exit;
   base::CommandLine::Init(argc, argv);
 
 #if !defined(OFFICIAL_BUILD)
   base::debug::EnableInProcessStackDumping();
 #endif
 
   mojo::runner::InitializeLogging();
   return mojo::runner::ChildProcessMain();
 }