Move shell service to toplevel shell namespace

services/shell/tests/connect/connect_test_package.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 <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/simple_thread.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/application_runner.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/shell/public/interfaces/shell_client_factory.mojom.h"
 #include "services/shell/tests/connect/connect_test.mojom.h"
 
 // Tests that multiple applications can be packaged in a single Mojo application
 // implementing ShellClientFactory; that these applications can be specified by
 // the package's manifest and are thus registered with the PackageManager.
 
-namespace mojo {
 namespace shell {
+
 namespace {
+
 void QuitLoop(base::RunLoop* loop) {
   loop->Quit();
 }
-}
+
+}  // namespace
 
 using GetTitleCallback = test::mojom::ConnectTestService::GetTitleCallback;
 
 class ProvidedShellClient
     : public ShellClient,
       public InterfaceFactory<test::mojom::ConnectTestService>,
       public InterfaceFactory<test::mojom::BlockedInterface>,
       public InterfaceFactory<test::mojom::UserIdTest>,
       public test::mojom::ConnectTestService,
       public test::mojom::BlockedInterface,
       public test::mojom::UserIdTest,
       public base::SimpleThread {
  public:
   ProvidedShellClient(const std::string& title,
                       mojom::ShellClientRequest request)
       : base::SimpleThread(title),
         title_(title),
         request_(std::move(request)) {
     Start();
   }
   ~ProvidedShellClient() override {
     Join();
   }
 
  private:
-  // mojo::ShellClient:
+  // shell::ShellClient:
   void Initialize(Connector* connector, const Identity& identity,
                   uint32_t id) override {
     connector_ = connector;
     identity_ = identity;
     id_ = id;
     bindings_.set_connection_error_handler(
         base::Bind(&ProvidedShellClient::OnConnectionError,
                    base::Unretained(this)));
   }
   bool AcceptConnection(Connection* connection) override {
@@ skipping 45 matching lines @@
   // test::mojom::BlockedInterface:
   void GetTitleBlocked(const GetTitleBlockedCallback& callback) override {
     callback.Run("Called Blocked Interface!");
   }
 
   // test::mojom::UserIdTest:
   void ConnectToClassAppAsDifferentUser(
       mojom::IdentityPtr target,
       const ConnectToClassAppAsDifferentUserCallback& callback) override {
     Connector::ConnectParams params(target.To<Identity>());
-    scoped_ptr<Connection> connection = connector_->Connect(&params);
+    std::unique_ptr<Connection> connection = connector_->Connect(&params);
     {
       base::RunLoop loop;
       connection->AddConnectionCompletedClosure(base::Bind(&QuitLoop, &loop));
       base::MessageLoop::ScopedNestableTaskAllower allow(
           base::MessageLoop::current());
       loop.Run();
     }
     callback.Run(static_cast<int32_t>(connection->GetResult()),
                  mojom::Identity::From(connection->GetRemoteIdentity()));
   }
 
   // base::SimpleThread:
   void Run() override {
     ApplicationRunner(this).Run(request_.PassMessagePipe().release().value(),
                                 false);
     delete this;
   }
 
   void OnConnectionError() {
     if (bindings_.empty())
       base::MessageLoop::current()->QuitWhenIdle();
   }
 
   Connector* connector_ = nullptr;
   Identity identity_;
   uint32_t id_ = shell::mojom::kInvalidInstanceID;
   const std::string title_;
   mojom::ShellClientRequest request_;
   test::mojom::ExposedInterfacePtr caller_;
-  BindingSet<test::mojom::ConnectTestService> bindings_;
-  BindingSet<test::mojom::BlockedInterface> blocked_bindings_;
-  BindingSet<test::mojom::UserIdTest> user_id_test_bindings_;
+  mojo::BindingSet<test::mojom::ConnectTestService> bindings_;
+  mojo::BindingSet<test::mojom::BlockedInterface> blocked_bindings_;
+  mojo::BindingSet<test::mojom::UserIdTest> user_id_test_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ProvidedShellClient);
 };
 
 class ConnectTestShellClient
     : public ShellClient,
       public InterfaceFactory<mojom::ShellClientFactory>,
       public InterfaceFactory<test::mojom::ConnectTestService>,
       public mojom::ShellClientFactory,
       public test::mojom::ConnectTestService {
  public:
   ConnectTestShellClient() {}
   ~ConnectTestShellClient() override {}
 
  private:
-  // mojo::ShellClient:
+  // shell::ShellClient:
   void Initialize(Connector* connector, const Identity& identity,
                   uint32_t id) override {
     identity_ = identity;
     bindings_.set_connection_error_handler(
         base::Bind(&ConnectTestShellClient::OnConnectionError,
                    base::Unretained(this)));
   }
   bool AcceptConnection(Connection* connection) override {
     connection->AddInterface<ShellClientFactory>(this);
     connection->AddInterface<test::mojom::ConnectTestService>(this);
     return true;
   }
 
   // InterfaceFactory<mojom::ShellClientFactory>:
   void Create(Connection* connection,
               mojom::ShellClientFactoryRequest request) override {
     shell_client_factory_bindings_.AddBinding(this, std::move(request));
   }
 
   // InterfaceFactory<test::mojom::ConnectTestService>:
   void Create(Connection* connection,
               test::mojom::ConnectTestServiceRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
   // mojom::ShellClientFactory:
   void CreateShellClient(mojom::ShellClientRequest request,
-                         const String& name) override {
+                         const mojo::String& name) override {
     if (name == "mojo:connect_test_a")
       new ProvidedShellClient("A", std::move(request));
     else if (name == "mojo:connect_test_b")
       new ProvidedShellClient("B", std::move(request));
   }
 
   // test::mojom::ConnectTestService:
   void GetTitle(const GetTitleCallback& callback) override {
     callback.Run("ROOT");
   }
   void GetInstance(const GetInstanceCallback& callback) override {
     callback.Run(identity_.instance());
   }
 
   void OnConnectionError() {
     if (bindings_.empty())
       base::MessageLoop::current()->QuitWhenIdle();
   }
 
   Identity identity_;
-  std::vector<scoped_ptr<ShellClient>> delegates_;
-  BindingSet<mojom::ShellClientFactory> shell_client_factory_bindings_;
-  BindingSet<test::mojom::ConnectTestService> bindings_;
+  std::vector<std::unique_ptr<ShellClient>> delegates_;
+  mojo::BindingSet<mojom::ShellClientFactory> shell_client_factory_bindings_;
+  mojo::BindingSet<test::mojom::ConnectTestService> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectTestShellClient);
 };
 
 }  // namespace shell
-}  // namespace mojo
-
 
 MojoResult MojoMain(MojoHandle shell_handle) {
-  MojoResult rv = mojo::ApplicationRunner(
-      new mojo::shell::ConnectTestShellClient).Run(shell_handle);
+  MojoResult rv = shell::ApplicationRunner(new shell::ConnectTestShellClient)
+                      .Run(shell_handle);
   return rv;
 }