Move //mojo/shell to //shell

shell/context.cc

Index: shell/context.cc
diff --git a/mojo/shell/context.cc b/shell/context.cc
similarity index 91%
rename from mojo/shell/context.cc
rename to shell/context.cc
index 0d2c30f8a1fee9d05ceda9d859473b287a4a64b2..0349c4dae65d6def5b77ccb3f7aa09a5bde9fb79 100644
--- a/mojo/shell/context.cc
+++ b/shell/context.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/shell/context.h"
+#include "shell/context.h"
 
 #include <vector>
 
@@ -24,21 +24,21 @@
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/shell/dynamic_application_loader.h"
-#include "mojo/shell/external_application_listener.h"
-#include "mojo/shell/in_process_dynamic_service_runner.h"
-#include "mojo/shell/out_of_process_dynamic_service_runner.h"
-#include "mojo/shell/switches.h"
-#include "mojo/shell/ui_application_loader_android.h"
 #include "mojo/spy/spy.h"
 #include "services/tracing/tracing.mojom.h"
+#include "shell/dynamic_application_loader.h"
+#include "shell/external_application_listener.h"
+#include "shell/in_process_dynamic_service_runner.h"
+#include "shell/out_of_process_dynamic_service_runner.h"
+#include "shell/switches.h"
+#include "shell/ui_application_loader_android.h"
 #include "url/gurl.h"
 
 #if defined(OS_ANDROID)
-#include "mojo/shell/android/android_handler_loader.h"
-#include "mojo/shell/network_application_loader.h"
 #include "services/gles2/gpu_impl.h"
 #include "services/native_viewport/native_viewport_impl.h"
+#include "shell/android/android_handler_loader.h"
+#include "shell/network_application_loader.h"
 #endif  // defined(OS_ANDROID)
 
 namespace mojo {
@@ -59,8 +59,7 @@ class Setup {
         new mojo::embedder::SimplePlatformSupport()));
   }
 
-  ~Setup() {
-  }
+  ~Setup() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Setup);
@@ -76,8 +75,8 @@ void InitContentHandlers(DynamicApplicationLoader* loader,
   loader->RegisterContentHandler("text/html", GURL("mojo:html_viewer"));
 
   // Command-line-specified content handlers.
-  std::string handlers_spec = command_line->GetSwitchValueASCII(
-      switches::kContentHandlers);
+  std::string handlers_spec =
+      command_line->GetSwitchValueASCII(switches::kContentHandlers);
   if (handlers_spec.empty())
     return;
 
@@ -232,9 +231,9 @@ bool Context::Init() {
   application_manager_.set_default_loader(
       scoped_ptr<ApplicationLoader>(dynamic_application_loader));
 
-  // The native viewport service synchronously waits for certain messages. If we
-  // don't run it on its own thread we can easily deadlock. Long term native
-  // viewport should run its own process so that this isn't an issue.
+// The native viewport service synchronously waits for certain messages. If we
+// don't run it on its own thread we can easily deadlock. Long term native
+// viewport should run its own process so that this isn't an issue.
 #if defined(OS_ANDROID)
   application_manager_.SetLoaderForURL(
       scoped_ptr<ApplicationLoader>(new UIApplicationLoader(
@@ -259,8 +258,7 @@ bool Context::Init() {
     scoped_ptr<BackgroundShellApplicationLoader> loader(
         new BackgroundShellApplicationLoader(
             scoped_ptr<ApplicationLoader>(new NetworkApplicationLoader()),
-            "network_service",
-            base::MessageLoop::TYPE_IO));
+            "network_service", base::MessageLoop::TYPE_IO));
     application_manager_.SetLoaderForURL(loader.Pass(),
                                          GURL("mojo:network_service"));
   }
@@ -310,8 +308,8 @@ ScopedMessagePipeHandle Context::ConnectToServiceByName(
     const GURL& application_url,
     const std::string& service_name) {
   app_urls_.insert(application_url);
-  return application_manager_.ConnectToServiceByName(
-      application_url, service_name).Pass();
+  return application_manager_.ConnectToServiceByName(application_url,
+                                                     service_name).Pass();
 }
 
 }  // namespace shell