Change signature of OnConnect

chrome/browser/chromeos/chrome_interface_factory.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 "chrome/browser/chromeos/chrome_interface_factory.h"
 
 #include <memory>
 
 #include "ash/sysui/public/interfaces/wallpaper.mojom.h"
 #include "base/lazy_instance.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/app_list/app_list_presenter_service.h"
 #include "chrome/browser/ui/ash/chrome_wallpaper_manager.h"
 #include "chrome/browser/ui/ash/keyboard_ui_service.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/connection.h"
+#include "services/shell/public/cpp/interface_registry.h"
 #include "ui/app_list/presenter/app_list_presenter.mojom.h"
 #include "ui/keyboard/keyboard.mojom.h"
 
 namespace chromeos {
 
 namespace {
 
 class ChromeLaunchable : public mash::mojom::Launchable {
  public:
   ChromeLaunchable() {}
@@ skipping 38 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ChromeLaunchable);
 };
 
 class FactoryImpl {
  public:
   FactoryImpl() {}
   ~FactoryImpl() {}
 
   template <typename Interface>
   static void AddFactory(
-      shell::Connection* connection,
+      shell::InterfaceRegistry* registry,
       scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
-    connection->AddInterface<Interface>(
+    registry->AddInterface<Interface>(
         base::Bind(&FactoryImpl::CallMainThreadFactory<Interface>),
         task_runner);
   }
 
  private:
   static FactoryImpl* Get() {
     if (!factory_.Get())
       factory_.Get().reset(new FactoryImpl);
     return factory_.Get().get();
   }
@@ skipping 45 matching lines @@
 base::LazyInstance<std::unique_ptr<FactoryImpl>>::Leaky FactoryImpl::factory_ =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 ChromeInterfaceFactory::ChromeInterfaceFactory()
     : main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
 
 ChromeInterfaceFactory::~ChromeInterfaceFactory() {}
 
-bool ChromeInterfaceFactory::OnConnect(shell::Connection* connection,
+bool ChromeInterfaceFactory::OnConnect(const shell::Identity& remote_identity,
+                                       shell::InterfaceRegistry* registry,
                                        shell::Connector* connector) {
-  FactoryImpl::AddFactory<keyboard::mojom::Keyboard>(
-      connection, main_thread_task_runner_);
-  FactoryImpl::AddFactory<mash::mojom::Launchable>(
-      connection, main_thread_task_runner_);
+  FactoryImpl::AddFactory<keyboard::mojom::Keyboard>(registry,
+                                                     main_thread_task_runner_);
+  FactoryImpl::AddFactory<mash::mojom::Launchable>(registry,
+                                                   main_thread_task_runner_);
   FactoryImpl::AddFactory<ash::sysui::mojom::WallpaperManager>(
-      connection, main_thread_task_runner_);
+      registry, main_thread_task_runner_);
   FactoryImpl::AddFactory<app_list::mojom::AppListPresenter>(
-      connection, main_thread_task_runner_);
+      registry, main_thread_task_runner_);
   return true;
 }
 
 }  // namespace chromeos