Replace OnConnect with OnBindInterface in //mash.

mash/catalog_viewer/catalog_viewer.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/catalog_viewer/catalog_viewer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
@@ skipping 189 matching lines @@
   ui::TableModelObserver* observer_;
   views::Textfield* capability_;
 
   std::vector<Entry> entries_;
 
   DISALLOW_COPY_AND_ASSIGN(CatalogViewerContents);
 };
 
 }  // namespace
 
-CatalogViewer::CatalogViewer() {}
+CatalogViewer::CatalogViewer() {
+  registry_.AddInterface<mojom::Launchable>(this);
+}
 CatalogViewer::~CatalogViewer() {}
 
 void CatalogViewer::RemoveWindow(views::Widget* window) {
   auto it = std::find(windows_.begin(), windows_.end(), window);
   DCHECK(it != windows_.end());
   windows_.erase(it);
   if (windows_.empty())
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
 void CatalogViewer::OnStart() {
   tracing_.Initialize(context()->connector(), context()->identity().name());
 
   aura_init_ = base::MakeUnique<views::AuraInit>(
       context()->connector(), context()->identity(), "views_mus_resources.pak",
       std::string(), nullptr, views::AuraInit::Mode::AURA_MUS);
 }
 
-bool CatalogViewer::OnConnect(const service_manager::ServiceInfo& remote_info,
-                              service_manager::InterfaceRegistry* registry) {
-  registry->AddInterface<mojom::Launchable>(this);
-  return true;
+void CatalogViewer::OnBindInterface(
+    const service_manager::ServiceInfo& source_info,
+    const std::string& interface_name,
+    mojo::ScopedMessagePipeHandle interface_pipe) {
+  registry_.BindInterface(source_info.identity, interface_name,
+                          std::move(interface_pipe));
 }
 
 void CatalogViewer::Launch(uint32_t what, mojom::LaunchMode how) {
   bool reuse = how == mojom::LaunchMode::REUSE ||
                how == mojom::LaunchMode::DEFAULT;
   if (reuse && !windows_.empty()) {
     windows_.back()->Activate();
     return;
   }
   catalog::mojom::CatalogPtr catalog;
   context()->connector()->BindInterface(catalog::mojom::kServiceName, &catalog);
 
   views::Widget* window = views::Widget::CreateWindowWithContextAndBounds(
       new CatalogViewerContents(this, std::move(catalog)), nullptr,
       gfx::Rect(25, 25, 500, 600));
   window->Show();
   windows_.push_back(window);
 }
 
 void CatalogViewer::Create(const service_manager::Identity& remote_identity,
                            mojom::LaunchableRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace catalog_viewer
 }  // namespace mash