Move mojo/runner to mojo/shell/standalone

mojo/shell/standalone/desktop/main_helper.h

Index: mojo/shell/standalone/desktop/main_helper.h
diff --git a/mojo/runner/desktop/main_helper.h b/mojo/shell/standalone/desktop/main_helper.h
similarity index 52%
rename from mojo/runner/desktop/main_helper.h
rename to mojo/shell/standalone/desktop/main_helper.h
index 09c135dacc55fcc8ad924da40a9d7dd9263573cd..4872707d33e66a07ccb8dbbe1528e70ba746a79d 100644
--- a/mojo/runner/desktop/main_helper.h
+++ b/mojo/shell/standalone/desktop/main_helper.h
@@ -2,24 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_RUNNER_DESKTOP_MAIN_HELPER_H
-#define MOJO_RUNNER_DESKTOP_MAIN_HELPER_H
+#ifndef MOJO_SHELL_STANDALONE_DESKTOP_MAIN_HELPER_H
+#define MOJO_SHELL_STANDALONE_DESKTOP_MAIN_HELPER_H
 
 #include "base/callback.h"
 #include "url/gurl.h"
 
 namespace mojo {
-namespace runner {
+namespace shell {
 
-// Helper method to start Mojo Runner code.
+// Helper method to start Mojo standalone shell code.
 // If |mojo_url| is not empty, the given mojo application is started. Otherwise,
 // an application must have been specified on the command line and it is run.
 // |callback| is only called in the later case.
-int RunnerMain(int argc, char** argv,
-               const GURL& mojo_url,
-               const base::Closure& callback);
+int StandaloneShellMain(int argc,
+                        char** argv,
+                        const GURL& mojo_url,
+                        const base::Closure& callback);
 
-}  // namespace runner
+}  // namespace shell
 }  // namespace mojo
 
-#endif  // MOJO_RUNNER_DESKTOP_MAIN_HELPER_H
+#endif  // MOJO_SHELL_STANDALONE_DESKTOP_MAIN_HELPER_H