Move shell service to toplevel shell namespace

services/shell/background/tests/test_service.cc

Index: services/shell/background/tests/test_service.cc
diff --git a/services/shell/background/tests/test_service.cc b/services/shell/background/tests/test_service.cc
index d6c042bcc02b12bbac06cd4b7dd74aac3b5f68a1..97499339d2a046593c11d9e73687ab18ed38599e 100644
--- a/services/shell/background/tests/test_service.cc
+++ b/services/shell/background/tests/test_service.cc
@@ -9,7 +9,6 @@
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/shell_client.h"
 
-namespace mojo {
 namespace shell {
 
 class TestClient : public ShellClient,
@@ -31,7 +30,7 @@ class TestClient : public ShellClient,
 
   // InterfaceFactory<mojom::TestService>:
   void Create(Connection* connection,
-              InterfaceRequest<mojom::TestService> request) override {
+              mojo::InterfaceRequest<mojom::TestService> request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
@@ -40,15 +39,14 @@ class TestClient : public ShellClient,
     callback.Run();
   }
 
-  BindingSet<mojom::TestService> bindings_;
+  mojo::BindingSet<mojom::TestService> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(TestClient);
 };
 
 }  // namespace shell
-}  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
-  mojo::ApplicationRunner runner(new mojo::shell::TestClient);
+  shell::ApplicationRunner runner(new shell::TestClient);
   return runner.Run(shell_handle);
 }