Move shell service to toplevel shell namespace

components/resource_provider/resource_provider_test_app.cc

 // Copyright 2016 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 <stddef.h>
 #include <stdint.h>
 
 #include "base/files/file.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ skipping 28 matching lines @@
 std::set<std::string> SetWithStrings(const std::string& contents1,
                                      const std::string& contents2) {
   std::set<std::string> result;
   result.insert(contents1);
   result.insert(contents2);
   return result;
 }
 
 class Test : public mojom::Test {
  public:
-  explicit Test(mojo::Connector* connector) : connector_(connector) {}
+  explicit Test(shell::Connector* connector) : connector_(connector) {}
   ~Test() override {}
 
   // mojom::Test:
   void GetResource1(const GetResource1Callback& callback) override {
     printf("GetResource1\n");
     ResourceContentsMap results(GetResources(SetWithString("sample")));
     printf("GetResource1 result %s\n", results["sample"].c_str());
     callback.Run(results["sample"]);
   }
   void GetBothResources(const GetBothResourcesCallback& callback) override {
@@ skipping 11 matching lines @@
 
     // Load the contents of each of the handles.
     ResourceContentsMap results;
     for (auto& path : paths) {
       base::File file(loader.ReleaseFile(path));
       results[path] = ReadFile(&file);
     }
     return results;
   }
 
-  mojo::Connector* connector_;
+  shell::Connector* connector_;
 
   DISALLOW_COPY_AND_ASSIGN(Test);
 };
 
-class TestApp : public mojo::ShellClient,
-                public mojo::InterfaceFactory<mojom::Test> {
+class TestApp : public shell::ShellClient,
+                public shell::InterfaceFactory<mojom::Test> {
  public:
   TestApp() {}
   ~TestApp() override {}
 
-  // mojo::ShellClient:
-  void Initialize(mojo::Connector* connector,
-                  const mojo::Identity& identity,
+  // shell::ShellClient:
+  void Initialize(shell::Connector* connector,
+                  const shell::Identity& identity,
                   uint32_t id) override {
     test_.reset(new Test(connector));
   }
-  bool AcceptConnection(mojo::Connection* connection) override {
+  bool AcceptConnection(shell::Connection* connection) override {
     connection->AddInterface<mojom::Test>(this);
     return true;
   }
 
   // InterfaceFactory<mojom::Test>:
-  void Create(mojo::Connection* connection,
+  void Create(shell::Connection* connection,
               mojom::TestRequest request) override {
     printf("test app create\n");
     bindings_.AddBinding(test_.get(), std::move(request));
   }
 
  private:
   scoped_ptr<Test> test_;
   mojo::BindingSet<test::mojom::Test> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(TestApp);
 };
 
 }  // namespace test
 }  // namespace resource_provider
 
 MojoResult MojoMain(MojoHandle shell_handle) {
-  return mojo::ApplicationRunner(new resource_provider::test::TestApp)
+  return shell::ApplicationRunner(new resource_provider::test::TestApp)
       .Run(shell_handle);
 }