Scaffolding for Android implementation of PaymentRequest.

content/browser/mojo/service_registrar_android.cc

Index: content/browser/mojo/service_registrar_android.cc
diff --git a/content/browser/mojo/service_registrar_android.cc b/content/browser/mojo/service_registrar_android.cc
index e29d7f328c37a8a1c7af2a705fef3344901ab9f7..017fcbd0d1d2450753436f207c6553fe05e9c7bd 100644
--- a/content/browser/mojo/service_registrar_android.cc
+++ b/content/browser/mojo/service_registrar_android.cc
@@ -6,7 +6,7 @@
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
-#include "content/browser/mojo/service_registry_android.h"
+#include "content/public/common/service_registry.h"
 #include "jni/ServiceRegistrar_jni.h"
 
 namespace content {
@@ -18,17 +18,19 @@ bool ServiceRegistrarAndroid::Register(JNIEnv* env) {
 
 // static
 void ServiceRegistrarAndroid::RegisterProcessHostServices(
-    ServiceRegistryAndroid* registry) {
+    ServiceRegistry* registry) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_ServiceRegistrar_registerProcessHostServices(
-      env, registry->GetObj().obj(), base::android::GetApplicationContext());
+      env, registry->GetJavaObj().obj(),
+      base::android::GetApplicationContext());
 }
 
 // static
 void ServiceRegistrarAndroid::RegisterFrameHostServices(
-    ServiceRegistryAndroid* registry) {
+    ServiceRegistry* registry) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_ServiceRegistrar_registerFrameHostServices(
-      env, registry->GetObj().obj(), base::android::GetApplicationContext());
+      env, registry->GetJavaObj().obj(),
+      base::android::GetApplicationContext());
 }
 }  // namespace content