Use public Service Manager Connector API in Blink

services/service_manager/public/cpp/lib/connector_impl.h

Index: services/service_manager/public/cpp/lib/connector_impl.h
diff --git a/services/service_manager/public/cpp/lib/connector_impl.h b/services/service_manager/public/cpp/lib/connector_impl.h
index e83ee0f28de1a4c13adb257efa1f715e9791b85c..6263f44a826d719b1e4f63fc7f583c73aa9a063c 100644
--- a/services/service_manager/public/cpp/lib/connector_impl.h
+++ b/services/service_manager/public/cpp/lib/connector_impl.h
@@ -36,18 +36,21 @@ class ConnectorImpl : public Connector {
   std::unique_ptr<Connector> Clone() override;
   void BindConnectorRequest(mojom::ConnectorRequest request) override;
   base::WeakPtr<Connector> GetWeakPtr() override;
-  void OverrideBinderForTesting(const std::string& interface_name,
+  void OverrideBinderForTesting(const std::string& service_name,
+                                const std::string& interface_name,
                                 const TestApi::Binder& binder) override;
   void ClearBinderOverrides() override;
 
   bool BindConnectorIfNecessary();
 
+  using BinderOverrideMap = std::map<std::string, TestApi::Binder>;
+
   mojom::ConnectorPtrInfo unbound_state_;
   mojom::ConnectorPtr connector_;
 
   base::ThreadChecker thread_checker_;
 
-  std::map<std::string, TestApi::Binder> local_binder_overrides_;
+  std::map<std::string, BinderOverrideMap> local_binder_overrides_;
 
   base::WeakPtrFactory<Connector> weak_factory_;