Rename ConnectToService to ConnectToInterface()

TBR=rockot@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1687693002

Cr-Commit-Position: refs/heads/master@{#374677}

8 files changed, 9 insertions, 9 deletions

diff --git a/mash/browser_driver/browser_driver_application_delegate.cc b/mash/browser_driver/browser_driver_application_delegate.cc
index 98ac6482..3bc7ede 100644
--- a/mash/browser_driver/browser_driver_application_delegate.cc
+++ b/mash/browser_driver/browser_driver_application_delegate.cc
@@ -82,7 +82,7 @@ void BrowserDriverApplicationDelegate::AddAccelerators() {
   // TODO(beng): find some other way to get the window manager. I don't like
   //             having to specify it by URL because it may differ per display.
   mus::mojom::AcceleratorRegistrarPtr registrar;
-  shell_->ConnectToService("mojo:desktop_wm", &registrar);
+  shell_->ConnectToInterface("mojo:desktop_wm", &registrar);
 
   if (binding_.is_bound())
     binding_.Unbind();
diff --git a/mash/example/window_type_launcher/window_type_launcher.cc b/mash/example/window_type_launcher/window_type_launcher.cc
index 14ffd16..b8dcbb6 100644
--- a/mash/example/window_type_launcher/window_type_launcher.cc
+++ b/mash/example/window_type_launcher/window_type_launcher.cc
@@ -274,7 +274,7 @@ class WindowTypeLauncherView : public views::WidgetDelegateView,
     }
     else if (sender == lock_button_) {
       mash::shell::mojom::ShellPtr shell;
-      shell_->ConnectToService("mojo:mash_shell", &shell);
+      shell_->ConnectToInterface("mojo:mash_shell", &shell);
       shell->LockScreen();
     }
     else if (sender == widgets_button_) {
diff --git a/mash/screenlock/screenlock.cc b/mash/screenlock/screenlock.cc
index df3a0ea..86f3bd4 100644
--- a/mash/screenlock/screenlock.cc
+++ b/mash/screenlock/screenlock.cc
@@ -60,7 +60,7 @@ class ScreenlockView : public views::WidgetDelegateView,
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
     DCHECK_EQ(sender, unlock_button_);
     mash::shell::mojom::ShellPtr shell;
-    shell_->ConnectToService("mojo:mash_shell", &shell);
+    shell_->ConnectToInterface("mojo:mash_shell", &shell);
     shell->UnlockScreen();
   }
 
@@ -81,7 +81,7 @@ void Screenlock::Initialize(mojo::Shell* shell, const std::string& url,
   tracing_.Initialize(shell, url);
 
   mash::shell::mojom::ShellPtr mash_shell;
-  shell_->ConnectToService("mojo:mash_shell", &mash_shell);
+  shell_->ConnectToInterface("mojo:mash_shell", &mash_shell);
   mash_shell->AddScreenlockStateListener(
       bindings_.CreateInterfacePtrAndBind(this));
 
diff --git a/mash/shelf/shelf_model.cc b/mash/shelf/shelf_model.cc
index 9e7e593..398094a 100644
--- a/mash/shelf/shelf_model.cc
+++ b/mash/shelf/shelf_model.cc
@@ -51,7 +51,7 @@ bool CompareByWeight(const ShelfItem& a, const ShelfItem& b) {
 
 ShelfModel::ShelfModel(mojo::Shell* shell)
     : next_id_(1), status_(STATUS_NORMAL), binding_(this) {
-  shell->ConnectToService("mojo:desktop_wm", &user_window_controller_);
+  shell->ConnectToInterface("mojo:desktop_wm", &user_window_controller_);
   user_window_controller_->AddUserWindowObserver(
       binding_.CreateInterfacePtrAndBind());
 }
diff --git a/mash/task_viewer/task_viewer_application_delegate.cc b/mash/task_viewer/task_viewer_application_delegate.cc
index ff3f9d3..beb8174 100644
--- a/mash/task_viewer/task_viewer_application_delegate.cc
+++ b/mash/task_viewer/task_viewer_application_delegate.cc
@@ -244,7 +244,7 @@ void TaskViewerApplicationDelegate::Initialize(mojo::Shell* shell,
   views::WindowManagerConnection::Create(shell);
 
   mojo::shell::mojom::ApplicationManagerPtr application_manager;
-  shell->ConnectToService("mojo:shell", &application_manager);
+  shell->ConnectToInterface("mojo:shell", &application_manager);
 
   mojo::shell::mojom::ApplicationManagerListenerPtr listener;
   ListenerRequest request = GetProxy(&listener);
diff --git a/mash/wm/accelerator_registrar_apptest.cc b/mash/wm/accelerator_registrar_apptest.cc
index 5cdc8b5..f7c31ae 100644
--- a/mash/wm/accelerator_registrar_apptest.cc
+++ b/mash/wm/accelerator_registrar_apptest.cc
@@ -72,7 +72,7 @@ class AcceleratorRegistrarTest : public mojo::test::ApplicationTestBase {
 
  protected:
   void ConnectToRegistrar(AcceleratorRegistrarPtr* registrar) {
-    shell()->ConnectToService("mojo:desktop_wm", registrar);
+    shell()->ConnectToInterface("mojo:desktop_wm", registrar);
   }
 
  private:
diff --git a/mash/wm/root_window_controller.cc b/mash/wm/root_window_controller.cc
index ab91b75..161d0cc 100644
--- a/mash/wm/root_window_controller.cc
+++ b/mash/wm/root_window_controller.cc
@@ -141,7 +141,7 @@ void RootWindowController::OnEmbed(mus::Window* root) {
   AddAccelerators();
 
   mash::shell::mojom::ShellPtr shell;
-  app_->shell()->ConnectToService("mojo:mash_shell", &shell);
+  app_->shell()->ConnectToInterface("mojo:mash_shell", &shell);
   window_manager_->Initialize(this, std::move(shell));
 
   shadow_controller_.reset(new ShadowController(root->connection()));
diff --git a/mash/wm/window_manager_application.cc b/mash/wm/window_manager_application.cc
index 704811d..0650c44 100644
--- a/mash/wm/window_manager_application.cc
+++ b/mash/wm/window_manager_application.cc
@@ -110,7 +110,7 @@ void WindowManagerApplication::Initialize(mojo::Shell* shell,
   tracing_.Initialize(shell, url);
 
   mus::mojom::WindowManagerFactoryServicePtr wm_factory_service;
-  shell_->ConnectToService("mojo:mus", &wm_factory_service);
+  shell_->ConnectToInterface("mojo:mus", &wm_factory_service);
   wm_factory_service->SetWindowManagerFactory(
       window_manager_factory_binding_.CreateInterfacePtrAndBind());