Move shell service to toplevel shell namespace

content/browser/mojo/mojo_shell_context.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_
 #define CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_
 
 #include <map>
 #include <memory>
 
@@ skipping 14 matching lines @@
 }
 
 namespace content {
 
 // MojoShellContext hosts the browser's ApplicationManager, coordinating
 // app registration and interconnection.
 class CONTENT_EXPORT MojoShellContext {
  public:
   using StaticApplicationMap =
       std::map<std::string,
-               base::Callback<std::unique_ptr<mojo::ShellClient>()>>;
+               base::Callback<std::unique_ptr<shell::ShellClient>()>>;
 
   MojoShellContext();
   ~MojoShellContext();
 
   // Connects an application at |name| and gets a handle to its exposed
   // services. This is only intended for use in browser code that's not part of
   // some Mojo application. May be called from any thread. |requestor_name| is
   // given to the target application as the requestor's name upon connection.
   static void ConnectToApplication(
       const std::string& user_id,
       const std::string& name,
       const std::string& requestor_name,
-      mojo::shell::mojom::InterfaceProviderRequest request,
-      mojo::shell::mojom::InterfaceProviderPtr exposed_services,
-      const mojo::shell::mojom::Connector::ConnectCallback& callback);
+      shell::mojom::InterfaceProviderRequest request,
+      shell::mojom::InterfaceProviderPtr exposed_services,
+      const shell::mojom::Connector::ConnectCallback& callback);
 
   static void SetApplicationsForTest(const StaticApplicationMap* apps);
 
  private:
   class BuiltinManifestProvider;
   class Proxy;
   friend class Proxy;
 
   void ConnectToApplicationOnOwnThread(
       const std::string& user_id,
       const std::string& name,
       const std::string& requestor_name,
-      mojo::shell::mojom::InterfaceProviderRequest request,
-      mojo::shell::mojom::InterfaceProviderPtr exposed_services,
-      const mojo::shell::mojom::Connector::ConnectCallback& callback);
+      shell::mojom::InterfaceProviderRequest request,
+      shell::mojom::InterfaceProviderPtr exposed_services,
+      const shell::mojom::Connector::ConnectCallback& callback);
 
   static base::LazyInstance<std::unique_ptr<Proxy>> proxy_;
 
   std::unique_ptr<BuiltinManifestProvider> manifest_provider_;
   std::unique_ptr<catalog::Factory> catalog_;
-  std::unique_ptr<mojo::shell::Shell> shell_;
+  std::unique_ptr<shell::Shell> shell_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoShellContext);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_