Scaffolding for Android implementation of PaymentRequest.

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 807924cb1e3714aeeed029e6644530f5ecf2233c..b164ba39925344b1f2aa852e2bdf651920681dcf 100644
--- a/content/common/mojo/service_registry_impl.h
+++ b/content/common/mojo/service_registry_impl.h
@@ -20,6 +20,8 @@
 
 namespace content {
 
+class ServiceRegistryAndroid;
+
 class CONTENT_EXPORT ServiceRegistryImpl
     : public ServiceRegistry,
       public NON_EXPORTED_BASE(mojo::shell::mojom::InterfaceProvider) {
@@ -49,6 +51,9 @@ class CONTENT_EXPORT ServiceRegistryImpl
       const std::string& service_name,
       const ServiceFactory& service_factory) override;
   void ClearServiceOverridesForTesting() override;
+#if defined(OS_ANDROID)
+  const base::android::ScopedJavaGlobalRef<jobject>& GetJavaObj() override;
+#endif
 
   bool IsBound() const;
 
@@ -70,6 +75,10 @@ class CONTENT_EXPORT ServiceRegistryImpl
 
   std::map<std::string, ServiceFactory> service_overrides_;
 
+#if defined(OS_ANDROID)
+  scoped_ptr<ServiceRegistryAndroid> android_impl_;
+#endif
+
   base::WeakPtrFactory<ServiceRegistry> weak_factory_;
 };