Use public Service Manager Connector API in Blink

services/service_manager/public/cpp/lib/connector_impl.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_LIB_CONNECTOR_IMPL_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_CONNECTOR_IMPL_H_
 
 #include <map>
 #include <memory>
 
@@ skipping 18 matching lines @@
                     mojom::ServicePtr service,
                     mojom::PIDReceiverRequest pid_receiver_request) override;
   std::unique_ptr<Connection> Connect(const std::string& name) override;
   std::unique_ptr<Connection> Connect(const Identity& target) override;
   void BindInterface(const Identity& target,
                      const std::string& interface_name,
                      mojo::ScopedMessagePipeHandle interface_pipe) override;
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectorImpl);
 };
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_CONNECTOR_IMPL_H_