Promote {Add,Clear}ServiceOverrideForTesting to ServiceRegistry public interface.

content/public/common/service_registry.h

 // Copyright 2014 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 CONTENT_PUBLIC_COMMON_SERVICE_REGISTRY_H_
 #define CONTENT_PUBLIC_COMMON_SERVICE_REGISTRY_H_
 
 #include <string>
 #include <utility>
 
@@ skipping 42 matching lines @@
   virtual void RemoveService(const std::string& service_name) = 0;
 
   // Connect to an interface provided by the remote service provider.
   template <typename Interface>
   void ConnectToRemoteService(mojo::InterfaceRequest<Interface> ptr) {
     ConnectToRemoteService(Interface::Name_, ptr.PassMessagePipe());
   }
   virtual void ConnectToRemoteService(const base::StringPiece& name,
                                       mojo::ScopedMessagePipeHandle handle) = 0;
 
+  // Registers a local service factory to intercept ConnectToRemoteService
+  // requests instead of actually connecting to the remote registry. Used only
+  // for testing.
+  virtual void AddServiceOverrideForTesting(
+      const std::string& service_name,
+      const base::Callback<void(mojo::ScopedMessagePipeHandle)>&
+          service_factory) = 0;
+
+  virtual void ClearServiceOverridesForTesting() = 0;

[jam, 2016/03/18 17:01:13]

nit: document

[leonhsl(Using Gerrit), 2016/03/19 05:05:12]

Done.

+
  private:
   template <typename Interface>
   static void ForwardToServiceFactory(
       const base::Callback<void(mojo::InterfaceRequest<Interface>)>
           service_factory,
       mojo::ScopedMessagePipeHandle handle) {
     service_factory.Run(mojo::MakeRequest<Interface>(std::move(handle)));
   }
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_SERVICE_REGISTRY_H_