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

services/service_manager/public/cpp/interface_provider.h

 // 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.
 
 #ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_PROVIDER_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_PROVIDER_H_
 
 #include "base/bind.h"
 #include "services/service_manager/public/interfaces/interface_provider.mojom.h"
 
 namespace service_manager {
 
+struct BindSourceInfo;
+
 // Encapsulates a mojom::InterfaceProviderPtr implemented in a remote
 // application. Provides two main features:
 // - a typesafe GetInterface() method for binding InterfacePtrs.
 // - a testing API that allows local callbacks to be registered that bind
 //   requests for remote interfaces.
 // An instance of this class is used by the GetInterface() methods on
 // Connection.
 class InterfaceProvider {
  public:
   using ForwardCallback = base::Callback<void(const std::string&,
@@ skipping 51 matching lines @@
     GetInterface(Interface::Name_, std::move(pipe.handle1));
   }
   template <typename Interface>
   void GetInterface(mojo::InterfaceRequest<Interface> request) {
     GetInterface(Interface::Name_, std::move(request.PassMessagePipe()));
   }
   void GetInterface(const std::string& name,
                     mojo::ScopedMessagePipeHandle request_handle);
 
   // Returns a callback to GetInterface<Interface>(). This can be passed to
-  // InterfaceRegistry::AddInterface() to forward requests.
+  // BinderRegistry::AddInterface() to forward requests.
   template <typename Interface>
-  base::Callback<void(mojo::InterfaceRequest<Interface>)>
+  base::Callback<void(const BindSourceInfo&, mojo::InterfaceRequest<Interface>)>
   CreateInterfaceFactory() {
-    // InterfaceProvider::GetInterface() is overloaded, so static_cast to select
-    // the overload that takes an mojo::InterfaceRequest<Interface>.
-    return base::Bind(static_cast<void (InterfaceProvider::*)(
-                          mojo::InterfaceRequest<Interface>)>(
-                          &InterfaceProvider::GetInterface<Interface>),
-                      GetWeakPtr());
+    return base::Bind(
+        &InterfaceProvider::BindInterfaceRequestFromSource<Interface>,
+        GetWeakPtr());
   }
 
  private:
+  template <typename Interface>
+  void BindInterfaceRequestFromSource(
+      const BindSourceInfo& source_info,
+      mojo::InterfaceRequest<Interface> request) {
+    GetInterface<Interface>(std::move(request));
+  }
+
   void SetBinderForName(
       const std::string& name,
       const base::Callback<void(mojo::ScopedMessagePipeHandle)>& binder) {
     binders_[name] = binder;
   }
   void ClearBinders();
 
   using BinderMap = std::map<
       std::string, base::Callback<void(mojo::ScopedMessagePipeHandle)>>;
   BinderMap binders_;
 
   mojom::InterfaceProviderPtr interface_provider_;
   mojom::InterfaceProviderRequest pending_request_;
 
   // A callback to receive all GetInterface() requests in lieu of the
   // InterfaceProvider pipe.
   ForwardCallback forward_callback_;
 
   base::WeakPtrFactory<InterfaceProvider> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InterfaceProvider);
 };
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_PROVIDER_H_