Move mojo/runner to mojo/shell/standalone

mojo/shell/standalone/android/background_application_loader_unittest.cc

Index: mojo/shell/standalone/android/background_application_loader_unittest.cc
diff --git a/mojo/runner/android/background_application_loader_unittest.cc b/mojo/shell/standalone/android/background_application_loader_unittest.cc
similarity index 71%
rename from mojo/runner/android/background_application_loader_unittest.cc
rename to mojo/shell/standalone/android/background_application_loader_unittest.cc
index 7201a63e7c67661b8be572b69c0c674194596751..9f66bf131654ea0a3487684fc328a32139ac927b 100644
--- a/mojo/runner/android/background_application_loader_unittest.cc
+++ b/mojo/shell/standalone/android/background_application_loader_unittest.cc
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/runner/android/background_application_loader.h"
+#include "mojo/shell/standalone/android/background_application_loader.h"
 
 #include "mojo/shell/public/interfaces/application.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
-namespace runner {
+namespace shell {
 namespace {
 
-class DummyLoader : public shell::ApplicationLoader {
+class DummyLoader : public ApplicationLoader {
  public:
   DummyLoader() : simulate_app_quit_(true) {}
   ~DummyLoader() override {}
 
-  // shell::ApplicationLoader overrides:
+  // ApplicationLoader overrides:
   void Load(const GURL& url,
             InterfaceRequest<Application> application_request) override {
     if (simulate_app_quit_)
@@ -31,21 +31,21 @@ class DummyLoader : public shell::ApplicationLoader {
 
 // Tests that the loader can start and stop gracefully.
 TEST(BackgroundApplicationLoaderTest, StartStop) {
-  scoped_ptr<shell::ApplicationLoader> real_loader(new DummyLoader());
-  BackgroundApplicationLoader loader(real_loader.Pass(), "test",
+  scoped_ptr<ApplicationLoader> real_loader(new DummyLoader());
+  BackgroundApplicationLoader loader(std::move(real_loader), "test",
                                      base::MessageLoop::TYPE_DEFAULT);
 }
 
 // Tests that the loader can load a service that is well behaved (quits
 // itself).
 TEST(BackgroundApplicationLoaderTest, Load) {
-  scoped_ptr<shell::ApplicationLoader> real_loader(new DummyLoader());
-  BackgroundApplicationLoader loader(real_loader.Pass(), "test",
+  scoped_ptr<ApplicationLoader> real_loader(new DummyLoader());
+  BackgroundApplicationLoader loader(std::move(real_loader), "test",
                                      base::MessageLoop::TYPE_DEFAULT);
   ApplicationPtr application;
   loader.Load(GURL(), GetProxy(&application));
 }
 
 }  // namespace
-}  // namespace runner
+}  // namespace shell
 }  // namespace mojo