Move shell service to toplevel shell namespace

content/browser/frame_host/frame_mojo_shell.cc

 // 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.
 
 #include "content/browser/frame_host/frame_mojo_shell.h"
 
 #include <utility>
 
 #include "build/build_config.h"
 #include "content/browser/mojo/mojo_shell_context.h"
@@ skipping 24 matching lines @@
 
 }  // namespace
 
 FrameMojoShell::FrameMojoShell(RenderFrameHost* frame_host)
     : frame_host_(frame_host) {
 }
 
 FrameMojoShell::~FrameMojoShell() {
 }
 
-void FrameMojoShell::BindRequest(mojo::shell::mojom::ConnectorRequest request) {
+void FrameMojoShell::BindRequest(shell::mojom::ConnectorRequest request) {
   connectors_.AddBinding(this, std::move(request));
 }
 
 // TODO(xhwang): Currently no callers are exposing |exposed_services|. So we
 // drop it and replace it with services we provide in the browser. In the
 // future we may need to support both.
 void FrameMojoShell::Connect(
-    mojo::shell::mojom::IdentityPtr target,
-    mojo::shell::mojom::InterfaceProviderRequest services,
-    mojo::shell::mojom::InterfaceProviderPtr /* exposed_services */,
-    mojo::shell::mojom::ClientProcessConnectionPtr client_process_connection,
-    const mojo::shell::mojom::Connector::ConnectCallback& callback) {
-  mojo::shell::mojom::InterfaceProviderPtr frame_services;
+    shell::mojom::IdentityPtr target,
+    shell::mojom::InterfaceProviderRequest services,
+    shell::mojom::InterfaceProviderPtr /* exposed_services */,
+    shell::mojom::ClientProcessConnectionPtr client_process_connection,
+    const shell::mojom::Connector::ConnectCallback& callback) {
+  shell::mojom::InterfaceProviderPtr frame_services;
   service_provider_bindings_.AddBinding(GetServiceRegistry(),
                                         GetProxy(&frame_services));
   std::string mojo_user_id = BrowserContext::GetMojoUserIdFor(
       frame_host_->GetProcess()->GetBrowserContext());
   MojoShellContext::ConnectToApplication(
       mojo_user_id, target->name,
       frame_host_->GetSiteInstance()->GetSiteURL().spec(), std::move(services),
       std::move(frame_services), callback);
 }
 
-void FrameMojoShell::Clone(mojo::shell::mojom::ConnectorRequest request) {
+void FrameMojoShell::Clone(shell::mojom::ConnectorRequest request) {
   connectors_.AddBinding(this, std::move(request));
 }
 
 ServiceRegistryImpl* FrameMojoShell::GetServiceRegistry() {
   if (!service_registry_) {
     service_registry_.reset(new ServiceRegistryImpl());
 
     // TODO(rockot/xhwang): Currently all applications connected share the same
     // set of services registered in the |registry|. We may want to provide
     // different services for different apps for better isolation.
     RegisterFrameMojoShellServices(service_registry_.get(), frame_host_);
     GetContentClient()->browser()->RegisterFrameMojoShellServices(
         service_registry_.get(), frame_host_);
   }
 
   return service_registry_.get();
 }
 
 }  // namespace content