Move //mojo/shell to //shell

shell/desktop/mojo_main.cc

Index: shell/desktop/mojo_main.cc
diff --git a/mojo/shell/desktop/mojo_main.cc b/shell/desktop/mojo_main.cc
similarity index 94%
rename from mojo/shell/desktop/mojo_main.cc
rename to shell/desktop/mojo_main.cc
index cda28f62bbd01b90a668072294ef753182a18bb7..6d3e1ea73686c6ad2b071e2950609adbdac699d8 100644
--- a/mojo/shell/desktop/mojo_main.cc
+++ b/shell/desktop/mojo_main.cc
@@ -12,11 +12,11 @@
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
-#include "mojo/shell/child_process.h"
-#include "mojo/shell/context.h"
-#include "mojo/shell/init.h"
-#include "mojo/shell/mojo_url_resolver.h"
-#include "mojo/shell/switches.h"
+#include "shell/child_process.h"
+#include "shell/context.h"
+#include "shell/init.h"
+#include "shell/mojo_url_resolver.h"
+#include "shell/switches.h"
 
 namespace {
 
@@ -91,8 +91,8 @@ void Usage() {
 
 bool IsArgsFor(const std::string& arg, std::string* value) {
   const std::string kArgsForSwitches[] = {
-    "-" + std::string(switches::kArgsFor),
-    "--" + std::string(switches::kArgsFor),
+      "-" + std::string(switches::kArgsFor),
+      "--" + std::string(switches::kArgsFor),
   };
   for (size_t i = 0; i < arraysize(kArgsForSwitches); i++) {
     std::string argsfor_switch(kArgsForSwitches[i]);
@@ -111,7 +111,7 @@ int main(int argc, char** argv) {
   base::CommandLine::Init(argc, argv);
 
   const base::CommandLine& command_line =
-    *base::CommandLine::ForCurrentProcess();
+      *base::CommandLine::ForCurrentProcess();
 
   const std::set<std::string> all_switches = switches::GetAllSwitches();
   const base::CommandLine::SwitchMap switches = command_line.GetSwitches();