Moves BackgroundShellApplicationLoader to shell/android

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/files/file_path.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"
 #include "mojo/application_manager/application_manager.h"
-#include "mojo/application_manager/background_shell_application_loader.h"
 #include "services/gles2/gpu_impl.h"
 #include "services/native_viewport/native_viewport_impl.h"
 #include "shell/android/android_handler_loader.h"
+#include "shell/android/background_application_loader.h"
 #include "shell/android/ui_application_loader_android.h"
 #include "shell/context.h"
 #include "shell/init.h"
 #include "ui/gl/gl_surface_egl.h"
 
 using base::LazyInstance;
 
 namespace mojo {
 namespace shell {
 
@@ skipping 58 matching lines @@
   context->application_manager()->SetLoaderForURL(
       make_scoped_ptr(new UIApplicationLoader(
           make_scoped_ptr(new NativeViewportApplicationLoader()),
           g_java_message_loop.Get().get())),
       GURL("mojo:native_viewport_service"));
 
   // 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 BackgroundShellApplicationLoader(
+      make_scoped_ptr(new BackgroundApplicationLoader(
           make_scoped_ptr(new AndroidHandlerLoader()), "android_handler",
           base::MessageLoop::TYPE_DEFAULT)),
       GURL("mojo:android_handler"));
 }
 
 void RunShell(std::vector<GURL> app_urls) {
   Context* context = g_context.Pointer()->get();
   context->Init();
   ConfigureAndroidServices(context);
   for (std::vector<GURL>::const_iterator it = app_urls.begin();
@@ skipping 53 matching lines @@
   g_shell_thread.Get()->message_loop()->PostTask(
       FROM_HERE, base::Bind(&RunShell, app_urls));
 }
 
 bool RegisterMojoMain(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace shell
 }  // namespace mojo