commit a5c972c3bc8cec76dd56c93a2991d3d02ad88f43
author ben <ben@chromium.org> Thu May 04 01:38:43 2017
committer Commit bot <commit-bot@chromium.org> Thu May 04 01:39:07 2017
tree a3b96d7582e9fe9a076195e4b7b8f6252591c1a5
parent 890116f93c9af3b455d299fb29e1b3ec19f82369

Eliminate bind callback that doesn't take a BindSourceInfo parameter.

R=rockot@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel

Review-Url: https://codereview.chromium.org/2851173004
Cr-Commit-Position: refs/heads/master@{#469241}

ash/mojo_interface_factory.cc

diff --git a/ash/mojo_interface_factory.cc b/ash/mojo_interface_factory.cc
index fc1f2b8e..3f2e0fb 100644
--- a/ash/mojo_interface_factory.cc
+++ b/ash/mojo_interface_factory.cc
@@ -21,6 +21,7 @@
 #include "ash/wallpaper/wallpaper_controller.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "base/bind.h"
+#include "services/service_manager/public/cpp/bind_source_info.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "ui/app_list/presenter/app_list.h"
 
@@ -29,61 +30,80 @@
 namespace {
 
 void BindAcceleratorControllerRequestOnMainThread(
+    const service_manager::BindSourceInfo& source_info,
     mojom::AcceleratorControllerRequest request) {
   Shell::Get()->accelerator_controller()->BindRequest(std::move(request));
 }
 
-void BindAppListRequestOnMainThread(app_list::mojom::AppListRequest request) {
+void BindAppListRequestOnMainThread(
+    const service_manager::BindSourceInfo& source_info,
+    app_list::mojom::AppListRequest request) {
   Shell::Get()->app_list()->BindRequest(std::move(request));
 }
 
-void BindCastConfigOnMainThread(mojom::CastConfigRequest request) {
+void BindCastConfigOnMainThread(
+    const service_manager::BindSourceInfo& source_info,
+    mojom::CastConfigRequest request) {
   Shell::Get()->cast_config()->BindRequest(std::move(request));
 }
 
 void BindLocaleNotificationControllerOnMainThread(
+    const service_manager::BindSourceInfo& source_info,
     mojom::LocaleNotificationControllerRequest request) {
   Shell::Get()->locale_notification_controller()->BindRequest(
       std::move(request));
 }
 
 void BindMediaControllerRequestOnMainThread(
+    const service_manager::BindSourceInfo& source_info,
     mojom::MediaControllerRequest request) {
   Shell::Get()->media_controller()->BindRequest(std::move(request));
 }
 
 void BindNewWindowControllerRequestOnMainThread(
+    const service_manager::BindSourceInfo& source_info,
     mojom::NewWindowControllerRequest request) {
   Shell::Get()->new_window_controller()->BindRequest(std::move(request));
 }
 
 void BindSessionControllerRequestOnMainThread(
+    const service_manager::BindSourceInfo& source_info,
     mojom::SessionControllerRequest request) {
   Shell::Get()->session_controller()->BindRequest(std::move(request));
 }
 
-void BindShelfRequestOnMainThread(mojom::ShelfControllerRequest request) {
+void BindShelfRequestOnMainThread(
+    const service_manager::BindSourceInfo& source_info,
+    mojom::ShelfControllerRequest request) {
   Shell::Get()->shelf_controller()->BindRequest(std::move(request));
 }
 
 void BindShutdownControllerRequestOnMainThread(
+    const service_manager::BindSourceInfo& source_info,
     mojom::ShutdownControllerRequest request) {
   Shell::Get()->shutdown_controller()->BindRequest(std::move(request));
 }
 
-void BindSystemTrayRequestOnMainThread(mojom::SystemTrayRequest request) {
+void BindSystemTrayRequestOnMainThread(
+    const service_manager::BindSourceInfo& source_info,
+    mojom::SystemTrayRequest request) {
   Shell::Get()->system_tray_controller()->BindRequest(std::move(request));
 }
 
-void BindTouchViewRequestOnMainThread(mojom::TouchViewManagerRequest request) {
+void BindTouchViewRequestOnMainThread(
+    const service_manager::BindSourceInfo& source_info,
+    mojom::TouchViewManagerRequest request) {
   Shell::Get()->maximize_mode_controller()->BindRequest(std::move(request));
 }
 
-void BindVpnListRequestOnMainThread(mojom::VpnListRequest request) {
+void BindVpnListRequestOnMainThread(
+    const service_manager::BindSourceInfo& source_info,
+    mojom::VpnListRequest request) {
   Shell::Get()->vpn_list()->BindRequest(std::move(request));
 }
 
 void BindWallpaperRequestOnMainThread(
+    const service_manager::BindSourceInfo& source_info,
     mojom::WallpaperControllerRequest request) {
   Shell::Get()->wallpaper_controller()->BindRequest(std::move(request));
 }