Move shell service to toplevel shell namespace

content/browser/mojo/mojo_child_connection.cc

Index: content/browser/mojo/mojo_child_connection.cc
diff --git a/content/browser/mojo/mojo_child_connection.cc b/content/browser/mojo/mojo_child_connection.cc
index 9f1e7b8acc738e729bf3f7678aab53c3a969b29a..6da74e286be7c218681eee2800c85cca2c43e511 100644
--- a/content/browser/mojo/mojo_child_connection.cc
+++ b/content/browser/mojo/mojo_child_connection.cc
@@ -32,20 +32,20 @@ const char kMojoRenderProcessHostConnection[] =
 class RenderProcessHostConnection : public base::SupportsUserData::Data {
  public:
   explicit RenderProcessHostConnection(
-      std::unique_ptr<mojo::Connection> connection)
+      std::unique_ptr<shell::Connection> connection)
       : connection_(std::move(connection)) {}
   ~RenderProcessHostConnection() override {}
 
-  mojo::Connection* get() const { return connection_.get(); }
+  shell::Connection* get() const { return connection_.get(); }
 
  private:
-  std::unique_ptr<mojo::Connection> connection_;
+  std::unique_ptr<shell::Connection> connection_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderProcessHostConnection);
 };
 
 void SetMojoConnection(RenderProcessHost* render_process_host,
-                       std::unique_ptr<mojo::Connection> connection) {
+                       std::unique_ptr<shell::Connection> connection) {
   render_process_host->SetUserData(
       kMojoRenderProcessHostConnection,
       new RenderProcessHostConnection(std::move(connection)));
@@ -53,11 +53,8 @@ void SetMojoConnection(RenderProcessHost* render_process_host,
 
 class PIDSender : public RenderProcessHostObserver {
  public:
-  PIDSender(
-      RenderProcessHost* host,
-      mojo::shell::mojom::PIDReceiverPtr pid_receiver)
-      : host_(host),
-        pid_receiver_(std::move(pid_receiver)) {
+  PIDSender(RenderProcessHost* host, shell::mojom::PIDReceiverPtr pid_receiver)
+      : host_(host), pid_receiver_(std::move(pid_receiver)) {
     pid_receiver_.set_connection_error_handler([this]() { delete this; });
     DCHECK(!host_->IsReady());
     host_->AddObserver(this);
@@ -80,7 +77,7 @@ class PIDSender : public RenderProcessHostObserver {
   }
 
   RenderProcessHost* host_;
-  mojo::shell::mojom::PIDReceiverPtr pid_receiver_;
+  shell::mojom::PIDReceiverPtr pid_receiver_;
 
   DISALLOW_COPY_AND_ASSIGN(PIDSender);
 };
@@ -102,23 +99,22 @@ std::string MojoConnectToChild(int child_process_id,
   if (!MojoShellConnection::Get())
     return pipe_token;
 
-  mojo::shell::mojom::ShellClientPtr client;
-  client.Bind(mojo::InterfacePtrInfo<mojo::shell::mojom::ShellClient>(
+  shell::mojom::ShellClientPtr client;
+  client.Bind(mojo::InterfacePtrInfo<shell::mojom::ShellClient>(
       std::move(shell_client_pipe), 0u));
-  mojo::shell::mojom::PIDReceiverPtr pid_receiver;
-  mojo::shell::mojom::PIDReceiverRequest pid_receiver_request =
+  shell::mojom::PIDReceiverPtr pid_receiver;
+  shell::mojom::PIDReceiverRequest pid_receiver_request =
       GetProxy(&pid_receiver);
   // PIDSender manages its own lifetime.
   new PIDSender(render_process_host, std::move(pid_receiver));
 
-  mojo::Identity target(kRendererMojoApplicationName,
-                        mojo::shell::mojom::kInheritUserID,
-                        base::StringPrintf("%d_%d", child_process_id,
-                                           instance_id));
-  mojo::Connector::ConnectParams params(target);
+  shell::Identity target(
+      kRendererMojoApplicationName, shell::mojom::kInheritUserID,
+      base::StringPrintf("%d_%d", child_process_id, instance_id));
+  shell::Connector::ConnectParams params(target);
   params.set_client_process_connection(std::move(client),
                                        std::move(pid_receiver_request));
-  std::unique_ptr<mojo::Connection> connection =
+  std::unique_ptr<shell::Connection> connection =
       MojoShellConnection::Get()->GetConnector()->Connect(&params);
 
   // Store the connection on the RPH so client code can access it later via
@@ -128,7 +124,7 @@ std::string MojoConnectToChild(int child_process_id,
   return pipe_token;
 }
 
-mojo::Connection* GetMojoConnection(RenderProcessHost* render_process_host) {
+shell::Connection* GetMojoConnection(RenderProcessHost* render_process_host) {
   RenderProcessHostConnection* connection =
       static_cast<RenderProcessHostConnection*>(
           render_process_host->GetUserData(kMojoRenderProcessHostConnection));