Scaffolding for Android implementation of PaymentRequest.

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 1b0946ed27a3be5f7a206ee54f60ed6e959bd417..7a4ff79c81c0e12d67e12cea6fcbbeb17da30690 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -2255,20 +2255,11 @@ void RenderFrameHostImpl::SetUpMojoIfNeeded() {
   service_registry_->BindRemoteServiceProvider(std::move(services));
 
 #if defined(OS_ANDROID)
-  service_registry_android_.reset(
-      new ServiceRegistryAndroid(service_registry_.get()));
-  ServiceRegistrarAndroid::RegisterFrameHostServices(
-      service_registry_android_.get());
+  ServiceRegistrarAndroid::RegisterFrameHostServices(service_registry_.get());
 #endif
 }
 
 void RenderFrameHostImpl::InvalidateMojoConnection() {
-#if defined(OS_ANDROID)
-  // The Android-specific service registry has a reference to
-  // |service_registry_| and thus must be torn down first.
-  service_registry_android_.reset();
-#endif
-
   service_registry_.reset();
 
   // Disconnect with ImageDownloader Mojo service in RenderFrame.