Scaffolding for Android implementation of PaymentRequest.

content/common/mojo/service_registry_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/mojo/service_registry_impl.h"
 
 #include <utility>
 
 #include "mojo/common/common_type_converters.h"
 
+#if defined(OS_ANDROID)
+#include "content/common/mojo/service_registry_android.h"
+#endif
+
 namespace content {
 
 ServiceRegistryImpl::ServiceRegistryImpl()
-    : binding_(this), weak_factory_(this) {}
+    : binding_(this),
+#if defined(OS_ANDROID)
+      android_impl_(new ServiceRegistryAndroid(this)),

[Sam McNally, 2016/03/31 23:40:26]

Can you delay creating this until the first call to GetJavaObj()?

[please use gerrit instead, 2016/04/01 01:23:27]

Done.

+#endif
+      weak_factory_(this) {
+}
 
 ServiceRegistryImpl::~ServiceRegistryImpl() {
   while (!pending_connects_.empty()) {
     mojo::CloseRaw(pending_connects_.front().second);
     pending_connects_.pop();
   }
 }
 
 void ServiceRegistryImpl::Bind(
     mojo::shell::mojom::InterfaceProviderRequest request) {
@@ skipping 44 matching lines @@
 void ServiceRegistryImpl::AddServiceOverrideForTesting(
     const std::string& service_name,
     const ServiceFactory& factory) {
   service_overrides_[service_name] = factory;
 }
 
 void ServiceRegistryImpl::ClearServiceOverridesForTesting() {
   service_overrides_.clear();
 }
 
+#if defined(OS_ANDROID)
+const base::android::ScopedJavaGlobalRef<jobject>&
+ServiceRegistryImpl::GetJavaObj() {
+  return android_impl_->GetObj();
+}
+#endif
+
 bool ServiceRegistryImpl::IsBound() const {
   return binding_.is_bound();
 }
 
 base::WeakPtr<ServiceRegistry> ServiceRegistryImpl::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 void ServiceRegistryImpl::GetInterface(
     const mojo::String& name,
@@ skipping 10 matching lines @@
   }
 
   it->second.Run(std::move(client_handle));
 }
 
 void ServiceRegistryImpl::OnConnectionError() {
   binding_.Close();
 }
 
 }  // namespace content