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

content/common/mojo/service_registry_impl.h

Index: content/common/mojo/service_registry_impl.h
diff --git a/content/common/mojo/service_registry_impl.h b/content/common/mojo/service_registry_impl.h
index 7c7748ee9549dbe2b53ec19d0bf8d1523b95a609..807924cb1e3714aeeed029e6644530f5ecf2233c 100644
--- a/content/common/mojo/service_registry_impl.h
+++ b/content/common/mojo/service_registry_impl.h
@@ -39,19 +39,16 @@ class CONTENT_EXPORT ServiceRegistryImpl
   void BindRemoteServiceProvider(
       mojo::shell::mojom::InterfaceProviderPtr service_provider);
 
-  // Registers a local service factory to intercept ConnectToRemoteService
-  // requests instead of actually connecting to the remote registry. Used only
-  // for testing.
-  void AddServiceOverrideForTesting(const std::string& service_name,
-                                    const ServiceFactory& service_factory);
-  void ClearServiceOverridesForTesting();
-
   // ServiceRegistry overrides.
   void AddService(const std::string& service_name,
                   const ServiceFactory service_factory) override;
   void RemoveService(const std::string& service_name) override;
   void ConnectToRemoteService(const base::StringPiece& service_name,
                               mojo::ScopedMessagePipeHandle handle) override;
+  void AddServiceOverrideForTesting(
+      const std::string& service_name,
+      const ServiceFactory& service_factory) override;
+  void ClearServiceOverridesForTesting() override;
 
   bool IsBound() const;