Eliminate OnConnect usage

ash/mus/window_manager_application.cc

 // Copyright 2015 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 "ash/mus/window_manager_application.h"
 
 #include <utility>
 
 #include "ash/common/mojo_interface_factory.h"
 #include "ash/common/system/chromeos/power/power_status.h"
@@ skipping 94 matching lines @@
   // We may not have started the NetworkHandler.
   if (chromeos::NetworkHandler::IsInitialized())
     chromeos::NetworkHandler::Shutdown();
   device::BluetoothAdapterFactory::Shutdown();
   bluez::BluezDBusManager::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
   message_center::MessageCenter::Shutdown();
 }
 
 void WindowManagerApplication::OnStart() {
+  mojo_interface_factory::RegisterInterfaces(
+      &registry_, base::ThreadTaskRunnerHandle::Get());
+
   aura_init_ = base::MakeUnique<views::AuraInit>(
       context()->connector(), context()->identity(), "ash_mus_resources.pak",
       "ash_mus_resources_200.pak", nullptr,
       views::AuraInit::Mode::AURA_MUS_WINDOW_MANAGER);
   window_manager_ =
       base::MakeUnique<WindowManager>(context()->connector(), Config::MASH);
 
   tracing_.Initialize(context()->connector(), context()->identity().name());
 
   std::unique_ptr<aura::WindowTreeClient> window_tree_client =
       base::MakeUnique<aura::WindowTreeClient>(
           context()->connector(), window_manager_.get(), window_manager_.get());
   window_tree_client->ConnectAsWindowManager();
 
   const size_t kMaxNumberThreads = 3u;  // Matches that of content.
   const char kThreadNamePrefix[] = "MashBlocking";
   blocking_pool_ = new base::SequencedWorkerPool(
       kMaxNumberThreads, kThreadNamePrefix, base::TaskPriority::USER_VISIBLE);
   const bool init_network_handler = true;
   InitWindowManager(std::move(window_tree_client), blocking_pool_,
                     init_network_handler);
 }
 
-bool WindowManagerApplication::OnConnect(
-    const service_manager::ServiceInfo& remote_info,
-    service_manager::InterfaceRegistry* registry) {
-  // Register services used in both classic ash and mash.
-  mojo_interface_factory::RegisterInterfaces(
-      registry, base::ThreadTaskRunnerHandle::Get());
-  return true;
+void WindowManagerApplication::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));
 }
 
 }  // namespace mus
 }  // namespace ash