Use public Service Manager Connector API in Blink

services/service_manager/public/cpp/connector.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_CONNECTOR_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CONNECTOR_H_
 
 #include <memory>
 
 #include "services/service_manager/public/cpp/connection.h"
@@ skipping 20 matching lines @@
 // connection with the service manager is bound to the lifetime of the instance
 // that
 // created it, i.e. when the application is terminated the Connector pipe is
 // closed.
 class Connector {
  public:
   class TestApi {
    public:
     using Binder = base::Callback<void(mojo::ScopedMessagePipeHandle)>;
     explicit TestApi(Connector* connector) : connector_(connector) {}
+
     // Allows caller to specify a callback to bind requests for |interface_name|
-    // locally, rather than passing the request through the Service Manager.
-    void OverrideBinderForTesting(const std::string& interface_name,
+    // from |service_name| locally, rather than passing the request through the
+    // Service Manager.
+    void OverrideBinderForTesting(const std::string& service_name,
+                                  const std::string& interface_name,
                                   const Binder& binder) {
-      connector_->OverrideBinderForTesting(interface_name, binder);
+      connector_->OverrideBinderForTesting(service_name, interface_name,
+                                           binder);
     }
     void ClearBinderOverrides() { connector_->ClearBinderOverrides(); }
 
    private:
     Connector* connector_;
   };
 
   virtual ~Connector() {}
 
   // Creates a new Connector instance and fills in |*request| with a request
@@ skipping 43 matching lines @@
   // The returned object may be passed multiple times until Connect() is called,
   // at which point this method must be called again to pass again.
   virtual std::unique_ptr<Connector> Clone() = 0;
 
   // Binds a Connector request to the other end of this Connector.
   virtual void BindConnectorRequest(mojom::ConnectorRequest request) = 0;
 
   virtual base::WeakPtr<Connector> GetWeakPtr() = 0;
 
  protected:
-  virtual void OverrideBinderForTesting(const std::string& interface_name,
+  virtual void OverrideBinderForTesting(const std::string& service_name,
+                                        const std::string& interface_name,
                                         const TestApi::Binder& binder) = 0;
   virtual void ClearBinderOverrides() = 0;
 };
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CONNECTOR_H_