Move //mojo/shell to //shell

shell/launcher_main.cc

 // Copyright 2014 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 "base/at_exit.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/shell/external_application_registrar_connection.h"
-#include "mojo/shell/in_process_dynamic_service_runner.h"
-#include "mojo/shell/init.h"
+#include "shell/external_application_registrar_connection.h"
+#include "shell/in_process_dynamic_service_runner.h"
+#include "shell/init.h"
 #include "url/gurl.h"
 
 namespace {
 const char kAppPath[] = "app-path";
 const char kAppURL[] = "app-url";
 const char kShellPath[] = "shell-path";
 }
 
 class Launcher {
  public:
@@ skipping 26 matching lines @@
     run_loop_.reset();
     return shell_handle_.is_valid();
   }
 
   void Run() {
     DCHECK(!run_loop_.get());
     DCHECK(shell_handle_.is_valid());
     mojo::shell::InProcessDynamicServiceRunner service_runner(nullptr);
     run_loop_.reset(new base::RunLoop);
     service_runner.Start(
-        app_path_,
-        shell_handle_.Pass(),
+        app_path_, shell_handle_.Pass(),
         base::Bind(&Launcher::OnAppCompleted, base::Unretained(this)));
     run_loop_->Run();
     run_loop_.reset();
   }
 
  private:
   void OnConnected(int result) {
     connect_result_ = result;
     run_loop_->Quit();
   }
 
   void OnRegistered(mojo::ShellPtr shell) {
     shell_handle_ = shell.PassMessagePipe();
     run_loop_->Quit();
   }
 
-  void OnAppCompleted() {
-    run_loop_->Quit();
-  }
+  void OnAppCompleted() { run_loop_->Quit(); }
 
   const base::FilePath app_path_;
   const GURL app_url_;
   base::MessageLoop loop_;
   mojo::shell::ExternalApplicationRegistrarConnection connection_;
   int connect_result_;
   mojo::ScopedMessagePipeHandle shell_handle_;
   scoped_ptr<base::RunLoop> run_loop_;
 };
 
@@ skipping 20 matching lines @@
 
   if (!launcher.Register()) {
     LOG(ERROR) << "Error registering "
                << command_line->GetSwitchValueASCII(kAppURL);
     return MOJO_RESULT_INVALID_ARGUMENT;
   }
 
   launcher.Run();
   return MOJO_RESULT_OK;
 }