Move shell service to toplevel shell namespace

services/shell/public/cpp/lib/connector_impl.h

Index: services/shell/public/cpp/lib/connector_impl.h
diff --git a/services/shell/public/cpp/lib/connector_impl.h b/services/shell/public/cpp/lib/connector_impl.h
index 330e0e66349b9fb30d95b3087863e4859d7ee88e..128469a7a0fe9652484cad2be701e00c005726f0 100644
--- a/services/shell/public/cpp/lib/connector_impl.h
+++ b/services/shell/public/cpp/lib/connector_impl.h
@@ -5,33 +5,35 @@
 #ifndef SERVICES_SHELL_PUBLIC_CPP_LIB_CONNECTOR_IMPL_H_
 #define SERVICES_SHELL_PUBLIC_CPP_LIB_CONNECTOR_IMPL_H_
 
+#include <memory>
+
 #include "base/callback.h"
 #include "base/threading/thread_checker.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 
-namespace mojo {
+namespace shell {
 
 class ConnectorImpl : public Connector {
  public:
-  explicit ConnectorImpl(shell::mojom::ConnectorPtrInfo unbound_state);
-  explicit ConnectorImpl(shell::mojom::ConnectorPtr connector);
+  explicit ConnectorImpl(mojom::ConnectorPtrInfo unbound_state);
+  explicit ConnectorImpl(mojom::ConnectorPtr connector);
   ~ConnectorImpl() override;
 
  private:
   // Connector:
-  scoped_ptr<Connection> Connect(const std::string& name) override;
-  scoped_ptr<Connection> Connect(ConnectParams* params) override;
-  scoped_ptr<Connector> Clone() override;
+  std::unique_ptr<Connection> Connect(const std::string& name) override;
+  std::unique_ptr<Connection> Connect(ConnectParams* params) override;
+  std::unique_ptr<Connector> Clone() override;
 
-  shell::mojom::ConnectorPtrInfo unbound_state_;
-  shell::mojom::ConnectorPtr connector_;
+  mojom::ConnectorPtrInfo unbound_state_;
+  mojom::ConnectorPtr connector_;
 
-  scoped_ptr<base::ThreadChecker> thread_checker_;
+  std::unique_ptr<base::ThreadChecker> thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectorImpl);
 };
 
-}  // namespace mojo
+}  // namespace shell
 
 #endif  // SERVICES_SHELL_PUBLIC_CPP_LIB_CONNECTOR_IMPL_H_