Move shell service to toplevel shell namespace

content/browser/mojo/browser_shell_connection.h

 // Copyright 2016 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_BROWSER_SHELL_CONNECTION_H_
 #define CONTENT_BROWSER_MOJO_BROWSER_SHELL_CONNECTION_H_
 
 #include <memory>
 #include <string>
 #include <unordered_map>
@@ skipping 11 matching lines @@
 #include "services/shell/public/cpp/shell_connection.h"
 #include "services/shell/public/interfaces/shell_client.mojom.h"
 #include "services/shell/public/interfaces/shell_client_factory.mojom.h"
 
 namespace content {
 
 // A connection from the browser process to the Mojo shell. There may be
 // multiple connections in a single browser process. Each connection may have
 // its own identity, e.g., a connection with unique user ID per BrowserContext.
 class BrowserShellConnection
-    : public mojo::ShellClient,
-      public mojo::InterfaceFactory<mojo::shell::mojom::ShellClientFactory>,
-      public mojo::shell::mojom::ShellClientFactory {
+    : public shell::ShellClient,
+      public shell::InterfaceFactory<shell::mojom::ShellClientFactory>,
+      public shell::mojom::ShellClientFactory {
  public:
-  explicit BrowserShellConnection(
-      mojo::shell::mojom::ShellClientRequest request);
+  explicit BrowserShellConnection(shell::mojom::ShellClientRequest request);
   ~BrowserShellConnection() override;
 
-  mojo::Connector* GetConnector();
+  shell::Connector* GetConnector();
 
   // Adds an embedded application to this connection's ShellClientFactory.
   // |callback| will be used to create a new instance of the application on
   // |task_runner|'s thread if no instance is running when an incoming
   // connection is made to |name|. If |task_runner| is null, the calling thread
   // will be used to run the application.
   void AddEmbeddedApplication(
       const base::StringPiece& name,
       const EmbeddedApplicationRunner::FactoryCallback& callback,
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
 
  private:
-  // mojo::ShellClient:
-  bool AcceptConnection(mojo::Connection* connection) override;
+  // shell::ShellClient:
+  bool AcceptConnection(shell::Connection* connection) override;
 
-  // mojo::InterfaceFactory<mojo::shell::mojom::ShellClientFactory>:
-  void Create(mojo::Connection* connection,
-              mojo::shell::mojom::ShellClientFactoryRequest request) override;
+  // shell::InterfaceFactory<shell::mojom::ShellClientFactory>:
+  void Create(shell::Connection* connection,
+              shell::mojom::ShellClientFactoryRequest request) override;
 
-  // mojo::shell::mojom::ShellClientFactory:
-  void CreateShellClient(mojo::shell::mojom::ShellClientRequest request,
+  // shell::mojom::ShellClientFactory:
+  void CreateShellClient(shell::mojom::ShellClientRequest request,
                          const mojo::String& name) override;
 
-  std::unique_ptr<mojo::ShellConnection> shell_connection_;
-  mojo::BindingSet<mojo::shell::mojom::ShellClientFactory> factory_bindings_;
+  std::unique_ptr<shell::ShellConnection> shell_connection_;
+  mojo::BindingSet<shell::mojom::ShellClientFactory> factory_bindings_;
   std::unordered_map<std::string, std::unique_ptr<EmbeddedApplicationRunner>>
       embedded_apps_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserShellConnection);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MOJO_BROWSER_SHELL_CONNECTION_H_