Rename shell namespace to service_manager

mash/login/login.cc

Index: mash/login/login.cc
diff --git a/mash/login/login.cc b/mash/login/login.cc
index 3d697d74b1ef7ba849c7ff3af573842c4c72d5e1..1f773e7ec919caea392a84efe2c6d73b67432f4b 100644
--- a/mash/login/login.cc
+++ b/mash/login/login.cc
@@ -36,8 +36,8 @@ class Login;
 class UI : public views::WidgetDelegateView,
            public views::ButtonListener {
  public:
-  static void Show(shell::Connector* connector,
-                   const shell::Identity& identity,
+  static void Show(service_manager::Connector* connector,
+                   const service_manager::Identity& identity,
                    Login* login) {
     UI* ui = new UI(login, connector);
     ui->StartWindowManager(identity);
@@ -60,7 +60,7 @@ class UI : public views::WidgetDelegateView,
   }
 
  private:
-  UI(Login* login, shell::Connector* connector)
+  UI(Login* login, service_manager::Connector* connector)
       : login_(login),
         connector_(connector),
         user_id_1_("00000000-0000-4000-8000-000000000000"),
@@ -109,7 +109,7 @@ class UI : public views::WidgetDelegateView,
   // Overridden from views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
-  void StartWindowManager(const shell::Identity& identity) {
+  void StartWindowManager(const service_manager::Identity& identity) {
     mash_wm_connection_ = connector_->Connect("service:ash");
     mash_wm_connection_->SetConnectionLostClosure(
         base::Bind(&UI::StartWindowManager, base::Unretained(this), identity));
@@ -118,19 +118,19 @@ class UI : public views::WidgetDelegateView,
   }
 
   Login* login_;
-  shell::Connector* connector_;
+  service_manager::Connector* connector_;
   const std::string user_id_1_;
   const std::string user_id_2_;
   views::MdTextButton* login_button_1_;
   views::MdTextButton* login_button_2_;
-  std::unique_ptr<shell::Connection> mash_wm_connection_;
+  std::unique_ptr<service_manager::Connection> mash_wm_connection_;
   std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(UI);
 };
 
-class Login : public shell::Service,
-              public shell::InterfaceFactory<mojom::Login>,
+class Login : public service_manager::Service,
+              public service_manager::InterfaceFactory<mojom::Login>,
               public mojom::Login {
  public:
    Login() {}
@@ -144,8 +144,8 @@ class Login : public shell::Service,
   }
 
  private:
-  // shell::Service:
-  void OnStart(const shell::Identity& identity) override {
+  // service_manager::Service:
+  void OnStart(const service_manager::Identity& identity) override {
     identity_ = identity;
     tracing_.Initialize(connector(), identity.name());
 
@@ -155,14 +155,14 @@ class Login : public shell::Service,
     connector()->ConnectToInterface("service:ui", &user_access_manager_);
     user_access_manager_->SetActiveUser(identity.user_id());
   }
-  bool OnConnect(const shell::Identity& remote_identity,
-                 shell::InterfaceRegistry* registry) override {
+  bool OnConnect(const service_manager::Identity& remote_identity,
+                 service_manager::InterfaceRegistry* registry) override {
     registry->AddInterface<mojom::Login>(this);
     return true;
   }
 
-  // shell::InterfaceFactory<mojom::Login>:
-  void Create(const shell::Identity& remote_identity,
+  // service_manager::InterfaceFactory<mojom::Login>:
+  void Create(const service_manager::Identity& remote_identity,
               mojom::LoginRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
@@ -177,7 +177,7 @@ class Login : public shell::Service,
 
   void StartWindowManager();
 
-  shell::Identity identity_;
+  service_manager::Identity identity_;
   tracing::Provider tracing_;
   std::unique_ptr<views::AuraInit> aura_init_;
   mojo::BindingSet<mojom::Login> bindings_;
@@ -200,7 +200,7 @@ void UI::ButtonPressed(views::Button* sender, const ui::Event& event) {
 
 }  // namespace
 
-shell::Service* CreateLogin() {
+service_manager::Service* CreateLogin() {
   return new Login;
 }