Move shell service to toplevel shell namespace

content/browser/browser_context.cc

 // Copyright (c) 2012 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.
 
 #include "content/public/browser/browser_context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <algorithm>
 #include <limits>
@@ skipping 109 matching lines @@
                         content::DownloadManager* download_manager) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(download_manager);
   context->SetUserData(kDownloadManagerKeyName, download_manager);
 }
 
 class BrowserContextShellConnectionHolder
     : public base::SupportsUserData::Data {
  public:
   BrowserContextShellConnectionHolder(
-      std::unique_ptr<mojo::Connection> connection,
-      mojo::shell::mojom::ShellClientRequest request)
+      std::unique_ptr<shell::Connection> connection,
+      shell::mojom::ShellClientRequest request)
       : root_connection_(std::move(connection)),
         shell_connection_(new BrowserShellConnection(std::move(request))) {}
   ~BrowserContextShellConnectionHolder() override {}
 
   BrowserShellConnection* shell_connection() { return shell_connection_.get(); }
 
  private:
-  std::unique_ptr<mojo::Connection> root_connection_;
+  std::unique_ptr<shell::Connection> root_connection_;
   std::unique_ptr<BrowserShellConnection> shell_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserContextShellConnectionHolder);
 };
 
 }  // namespace
 
 // static
 void BrowserContext::AsyncObliterateStoragePartition(
     BrowserContext* browser_context,
@@ skipping 226 matching lines @@
 
   user_service::AssociateMojoUserIDWithUserDir(new_id, path);
   browser_context->SetUserData(kMojoWasInitialized,
                                new base::SupportsUserData::Data);
 
   MojoShellConnection* shell = MojoShellConnection::Get();
   if (shell) {
     // NOTE: Many unit tests create a TestBrowserContext without initializing
     // Mojo or the global Mojo shell connection.
 
-    mojo::shell::mojom::ShellClientPtr shell_client;
-    mojo::shell::mojom::ShellClientRequest shell_client_request =
+    shell::mojom::ShellClientPtr shell_client;
+    shell::mojom::ShellClientRequest shell_client_request =
         mojo::GetProxy(&shell_client);
 
-    mojo::shell::mojom::PIDReceiverPtr pid_receiver;
-    mojo::Connector::ConnectParams params(
-        mojo::Identity(kBrowserMojoApplicationName, new_id));
+    shell::mojom::PIDReceiverPtr pid_receiver;
+    shell::Connector::ConnectParams params(
+        shell::Identity(kBrowserMojoApplicationName, new_id));
     params.set_client_process_connection(std::move(shell_client),
                                          mojo::GetProxy(&pid_receiver));
     pid_receiver->SetPID(base::GetCurrentProcId());
 
     BrowserContextShellConnectionHolder* connection_holder =
         new BrowserContextShellConnectionHolder(
           shell->GetConnector()->Connect(&params),
           std::move(shell_client_request));
     browser_context->SetUserData(kMojoShellConnection, connection_holder);
 
@@ skipping 24 matching lines @@
   auto it = std::find_if(
       g_context_to_user_id.Get().begin(),
       g_context_to_user_id.Get().end(),
       [&browser_context](const std::pair<BrowserContext*, std::string>& p) {
         return p.first == browser_context; });
   CHECK(it != g_context_to_user_id.Get().end());
   return it->second;
 }
 
 // static
-mojo::Connector* BrowserContext::GetMojoConnectorFor(
+shell::Connector* BrowserContext::GetMojoConnectorFor(
     BrowserContext* browser_context) {
   BrowserContextShellConnectionHolder* connection_holder =
       static_cast<BrowserContextShellConnectionHolder*>(
           browser_context->GetUserData(kMojoShellConnection));
   if (!connection_holder)
     return nullptr;
   return connection_holder->shell_connection()->GetConnector();
 }
 
 BrowserContext::~BrowserContext() {
   CHECK(GetUserData(kMojoWasInitialized))
       << "Attempting to destroy a BrowserContext that never called "
       << "Initialize()";
 
   if (GetUserData(kDownloadManagerKeyName))
     GetDownloadManager(this)->Shutdown();
 }
 
 }  // namespace content