Rename mojo: to service:

mash/login/login.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 "mash/login/login.h"
 
 #include <map>
 #include <memory>
 
 #include "ash/public/interfaces/container.mojom.h"
@@ skipping 93 matching lines @@
     login_button_1_->SetBounds(button_box.x(), button_box.y(), ps1.width(),
                                ps1.height());
     login_button_2_->SetBounds(login_button_1_->bounds().right() + 10,
                                button_box.y(), ps2.width(), ps2.height());
   }
 
   // Overridden from views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;
 
   void StartWindowManager(const shell::Identity& identity) {
-    mash_wm_connection_ = connector_->Connect("mojo:ash");
+    mash_wm_connection_ = connector_->Connect("service:ash");
     mash_wm_connection_->SetConnectionLostClosure(
         base::Bind(&UI::StartWindowManager, base::Unretained(this), identity));
     window_manager_connection_ =
         views::WindowManagerConnection::Create(connector_, identity);
   }
 
   Login* login_;
   shell::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<views::WindowManagerConnection> window_manager_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(UI);
 };
 
 class Login : public shell::Service,
               public shell::InterfaceFactory<mojom::Login>,
               public mojom::Login {
  public:
    Login() {}
   ~Login() override {}
 
   void LoginAs(const std::string& user_id) {
     user_access_manager_->SetActiveUser(user_id);
     mash::init::mojom::InitPtr init;
-    connector()->ConnectToInterface("mojo:mash_init", &init);
-    init->StartService("mojo:mash_session", user_id);
+    connector()->ConnectToInterface("service:mash_init", &init);
+    init->StartService("service:mash_session", user_id);
   }
 
  private:
   // shell::Service:
   void OnStart(const shell::Identity& identity) override {
     identity_ = identity;
     tracing_.Initialize(connector(), identity.name());
 
     aura_init_.reset(
         new views::AuraInit(connector(), "views_mus_resources.pak"));
 
-    connector()->ConnectToInterface("mojo:ui", &user_access_manager_);
+    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 {
     registry->AddInterface<mojom::Login>(this);
     return true;
   }
 
   // shell::InterfaceFactory<mojom::Login>:
   void Create(const shell::Identity& remote_identity,
@@ skipping 33 matching lines @@
 }
 
 }  // namespace
 
 shell::Service* CreateLogin() {
   return new Login;
 }
 
 }  // namespace login
 }  // namespace main