Move mojo/runner to mojo/shell/standalone

mojo/shell/standalone/android/android_handler_loader.h

Index: mojo/shell/standalone/android/android_handler_loader.h
diff --git a/mojo/runner/android/android_handler_loader.h b/mojo/shell/standalone/android/android_handler_loader.h
similarity index 68%
rename from mojo/runner/android/android_handler_loader.h
rename to mojo/shell/standalone/android/android_handler_loader.h
index 8c8e4e4ad77cc97c3a76d65d9e53c3128ee2918b..013674297f04610c165a3d728e5d33e8214b8d88 100644
--- a/mojo/runner/android/android_handler_loader.h
+++ b/mojo/shell/standalone/android/android_handler_loader.h
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_RUNNER_ANDROID_ANDROID_HANDLER_LOADER_H_
-#define MOJO_RUNNER_ANDROID_ANDROID_HANDLER_LOADER_H_
+#ifndef MOJO_SHELL_STANDALONE_ANDROID_ANDROID_HANDLER_LOADER_H_
+#define MOJO_SHELL_STANDALONE_ANDROID_ANDROID_HANDLER_LOADER_H_
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "mojo/runner/android/android_handler.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/standalone/android/android_handler.h"
 
 namespace mojo {
-namespace runner {
+namespace shell {
 
-class AndroidHandlerLoader : public shell::ApplicationLoader {
+class AndroidHandlerLoader : public ApplicationLoader {
  public:
   AndroidHandlerLoader();
   virtual ~AndroidHandlerLoader();
@@ -31,7 +31,7 @@ class AndroidHandlerLoader : public shell::ApplicationLoader {
   DISALLOW_COPY_AND_ASSIGN(AndroidHandlerLoader);
 };
 
-}  // namespace runner
+}  // namespace shell
 }  // namespace mojo
 
-#endif  // MOJO_RUNNER_ANDROID_ANDROID_HANDLER_LOADER_H_
+#endif  // MOJO_SHELL_STANDALONE_ANDROID_ANDROID_HANDLER_LOADER_H_