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

content/common/mojo/service_registry_impl.cc

Index: content/common/mojo/service_registry_impl.cc
diff --git a/content/common/mojo/service_registry_impl.cc b/content/common/mojo/service_registry_impl.cc
index 5e3b4157638b7572b7a0416f9eb15f833e63c105..b26c60990bed5340a32939e2b7aca464966ff46e 100644
--- a/content/common/mojo/service_registry_impl.cc
+++ b/content/common/mojo/service_registry_impl.cc
@@ -39,16 +39,6 @@ void ServiceRegistryImpl::BindRemoteServiceProvider(
   }
 }
 
-void ServiceRegistryImpl::AddServiceOverrideForTesting(
-    const std::string& service_name,
-    const ServiceFactory& factory) {
-  service_overrides_[service_name] = factory;
-}
-
-void ServiceRegistryImpl::ClearServiceOverridesForTesting() {
-  service_overrides_.clear();
-}
-
 void ServiceRegistryImpl::AddService(const std::string& service_name,
                                      const ServiceFactory service_factory) {
   service_factories_[service_name] = service_factory;
@@ -76,6 +66,16 @@ void ServiceRegistryImpl::ConnectToRemoteService(
       mojo::String::From(service_name.as_string()), std::move(handle));
 }
 
+void ServiceRegistryImpl::AddServiceOverrideForTesting(
+    const std::string& service_name,
+    const ServiceFactory& factory) {
+  service_overrides_[service_name] = factory;
+}
+
+void ServiceRegistryImpl::ClearServiceOverridesForTesting() {
+  service_overrides_.clear();
+}
+
 bool ServiceRegistryImpl::IsBound() const {
   return binding_.is_bound();
 }