Fix content/shell including internals of content for service worker test.

content/shell/browser/shell_mojo_test_utils_android.cc

Index: content/shell/browser/shell_mojo_test_utils_android.cc
diff --git a/content/shell/browser/shell_mojo_test_utils_android.cc b/content/shell/browser/shell_mojo_test_utils_android.cc
index ba022906d611ff17be3aee7330586aabe216f4b9..a98c94a038ad3ba5738808b8d75197981ea0b9f0 100644
--- a/content/shell/browser/shell_mojo_test_utils_android.cc
+++ b/content/shell/browser/shell_mojo_test_utils_android.cc
@@ -9,15 +9,15 @@
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "content/common/mojo/service_registry_impl.h"
 #include "content/public/browser/android/service_registry_android.h"
+#include "content/public/common/service_registry.h"
 #include "jni/ShellMojoTestUtils_jni.h"
 
 namespace {
 
 struct TestEnvironment {
   base::MessageLoop message_loop;
-  ScopedVector<content::ServiceRegistryImpl> registries;
+  ScopedVector<content::ServiceRegistry> registries;
   ScopedVector<content::ServiceRegistryAndroid> wrappers;
 };
 
@@ -43,9 +43,9 @@ static ScopedJavaLocalRef<jobject> CreateServiceRegistryPair(
   TestEnvironment* test_environment =
       reinterpret_cast<TestEnvironment*>(native_test_environment);
 
-  content::ServiceRegistryImpl* registry_a = new ServiceRegistryImpl();
+  content::ServiceRegistry* registry_a = ServiceRegistry::Create();
   test_environment->registries.push_back(registry_a);
-  content::ServiceRegistryImpl* registry_b = new ServiceRegistryImpl();
+  content::ServiceRegistry* registry_b = ServiceRegistry::Create();
   test_environment->registries.push_back(registry_b);
 
   shell::mojom::InterfaceProviderPtr exposed_services_a;