Move mojo\shell to services\shell

services/shell/shell.cc

Index: services/shell/shell.cc
diff --git a/mojo/shell/shell.cc b/services/shell/shell.cc
similarity index 97%
rename from mojo/shell/shell.cc
rename to services/shell/shell.cc
index cfabfd609704b60949a40db49cb1e0a54272febd..fac23f19f58049249f6b24cb33ea956b37d23ddc 100644
--- a/mojo/shell/shell.cc
+++ b/services/shell/shell.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/shell.h"
+#include "services/shell/shell.h"
 
 #include <stdint.h>
 
@@ -21,14 +21,14 @@
 #include "mojo/common/url_type_converters.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/shell/connect_util.h"
-#include "mojo/shell/public/cpp/connector.h"
-#include "mojo/shell/public/cpp/names.h"
-#include "mojo/shell/public/cpp/shell_connection.h"
-#include "mojo/shell/public/interfaces/connector.mojom.h"
-#include "mojo/shell/public/interfaces/shell.mojom.h"
-#include "mojo/shell/public/interfaces/shell_client.mojom.h"
 #include "mojo/util/filename_util.h"
+#include "services/shell/connect_util.h"
+#include "services/shell/public/cpp/connector.h"
+#include "services/shell/public/cpp/names.h"
+#include "services/shell/public/cpp/shell_connection.h"
+#include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/shell/public/interfaces/shell.mojom.h"
+#include "services/shell/public/interfaces/shell_client.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
@@ -109,7 +109,7 @@ class Shell::Instance : public mojom::Connector,
                         public InterfaceFactory<mojom::Shell>,
                         public mojom::Shell {
  public:
-  Instance(mojo::shell::Shell* shell,
+  Instance(shell::Shell* shell,
            const Identity& identity,
            const CapabilitySpec& capability_spec)
     : shell_(shell),
@@ -195,7 +195,7 @@ class Shell::Instance : public mojom::Connector,
     mojom::ShellClientPtr client = runner->Start(
         path, identity_, start_sandboxed,
         base::Bind(&Instance::PIDAvailable, weak_factory_.GetWeakPtr()),
-        base::Bind(&mojo::shell::Shell::CleanupRunner,
+        base::Bind(&shell::Shell::CleanupRunner,
                    shell_->weak_ptr_factory_.GetWeakPtr(), runner.get()));
     shell_->native_runners_.push_back(std::move(runner));
     StartWithClient(std::move(client));
@@ -379,12 +379,12 @@ class Shell::Instance : public mojom::Connector,
     shell_->NotifyPIDAvailable(id_, pid_);
   }
 
-  void OnShellClientLost(base::WeakPtr<mojo::shell::Shell> shell) {
+  void OnShellClientLost(base::WeakPtr<shell::Shell> shell) {
     shell_client_.reset();
     OnConnectionLost(shell);
   }
 
-  void OnConnectionLost(base::WeakPtr<mojo::shell::Shell> shell) {
+  void OnConnectionLost(base::WeakPtr<shell::Shell> shell) {
     // Any time a Connector is lost or we lose the ShellClient connection, it
     // may have been the last pipe using this Instance. If so, clean up.
     if (shell && connectors_.empty() && !shell_client_) {
@@ -402,7 +402,7 @@ class Shell::Instance : public mojom::Connector,
     }
   }
 
-  mojo::shell::Shell* const shell_;
+  shell::Shell* const shell_;
 
   // An id that identifies this instance. Distinct from pid, as a single process
   // may vend multiple application instances, and this object may exist before a
@@ -525,7 +525,7 @@ void Shell::InitCatalog(mojom::ShellClientPtr catalog) {
 
   // TODO(beng): this doesn't work anymore.
   // Seed the catalog with manifest info for the shell & catalog.
-  mojo::shell::mojom::ShellResolverPtr resolver;
+  shell::mojom::ShellResolverPtr resolver;
   shell_connection_->connector()->ConnectToInterface(kCatalogName, &resolver);
   resolver->ResolveMojoName(kCatalogName, base::Bind(&EmptyResolverCallback));
   resolver->ResolveMojoName(kShellName, base::Bind(&EmptyResolverCallback));