Move shell service to toplevel shell namespace

content/browser/mojo_shell_browsertest.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 <memory>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "content/browser/mojo/mojo_shell_context.h"
@@ skipping 17 matching lines @@
     MojoShellContext::SetApplicationsForTest(&test_apps_);
   }
 
  protected:
   std::string GetUserId() {
     return BrowserContext::GetMojoUserIdFor(
         shell()->web_contents()->GetBrowserContext());
   }
 
  private:
-  static std::unique_ptr<mojo::ShellClient> CreateTestApp() {
-    return std::unique_ptr<mojo::ShellClient>(new TestMojoApp);
+  static std::unique_ptr<shell::ShellClient> CreateTestApp() {
+    return std::unique_ptr<shell::ShellClient>(new TestMojoApp);
   }
 
   MojoShellContext::StaticApplicationMap test_apps_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoShellTest);
 };
 
 IN_PROC_BROWSER_TEST_F(MojoShellTest, TestBrowserConnection) {
   auto test_app = MojoAppConnection::Create(
       GetUserId(), kInProcessTestMojoAppName, kBrowserMojoAppUrl);
@@ skipping 13 matching lines @@
                                             kBrowserMojoAppUrl);
   mojom::TestMojoServicePtr test_service;
   test_app->GetInterface(&test_service);
 
   base::RunLoop run_loop;
   test_service->DoSomething(run_loop.QuitClosure());
   run_loop.Run();
 }
 
 }  // namespace content