Scaffolding for Android implementation of PaymentRequest.

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 807cb57fa8804a023cc90cc7180dbd81350a23c1..1b4d81afb03ca67fb7da1ff8e0953f6a9fc4a8b0 100644
--- a/content/shell/browser/shell_mojo_test_utils_android.cc
+++ b/content/shell/browser/shell_mojo_test_utils_android.cc
@@ -9,8 +9,8 @@
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "content/browser/mojo/service_registry_android.h"
 #include "content/common/mojo/service_registry_impl.h"
+#include "content/public/browser/android/service_registry_android.h"
 #include "jni/ShellMojoTestUtils_jni.h"
 
 namespace {
@@ -18,7 +18,6 @@ namespace {
 struct TestEnvironment {
   base::MessageLoop message_loop;
   ScopedVector<content::ServiceRegistryImpl> registries;
-  ScopedVector<content::ServiceRegistryAndroid> wrappers;
 };
 
 }  // namespace
@@ -56,15 +55,9 @@ static ScopedJavaLocalRef<jobject> CreateServiceRegistryPair(
   registry_b->Bind(GetProxy(&exposed_services_b));
   registry_a->BindRemoteServiceProvider(std::move(exposed_services_b));
 
-  content::ServiceRegistryAndroid* wrapper_a =
-      new ServiceRegistryAndroid(registry_a);
-  test_environment->wrappers.push_back(wrapper_a);
-  content::ServiceRegistryAndroid* wrapper_b =
-      new ServiceRegistryAndroid(registry_b);
-  test_environment->wrappers.push_back(wrapper_b);
-
-  return Java_ShellMojoTestUtils_makePair(env, wrapper_a->GetObj().obj(),
-                                          wrapper_b->GetObj().obj());
+  return Java_ShellMojoTestUtils_makePair(
+      env, ServiceRegistryAndroid::From(registry_a)->GetObj().obj(),
+      ServiceRegistryAndroid::From(registry_b)->GetObj().obj());
 }
 
 static void RunLoop(JNIEnv* env,