Split ServiceRegistryAndroid into InterfaceRegistryAndroid and InterfaceProviderAndroid

content/browser/mojo/mojo_child_connection.cc

 // Copyright 2015 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/browser/mojo/mojo_child_connection.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 138 matching lines @@
       application_name, instance_id, connector, std::move(service_pipe),
       io_task_runner,
       base::Bind(&MojoChildConnection::GetInterface,
                  weak_factory_.GetWeakPtr()));
   remote_interfaces_.Forward(
       base::Bind(&CallBinderOnTaskRunner,
                  base::Bind(&IOThreadContext::GetRemoteInterfaceOnIOThread,
                             context_), io_task_runner));
 
 #if defined(OS_ANDROID)
-  service_registry_android_ =
-      ServiceRegistryAndroid::Create(&interface_registry_, &remote_interfaces_);
+  interface_registry_android_ =
+      InterfaceRegistryAndroid::Create(&interface_registry_);
 #endif
 }
 
 MojoChildConnection::~MojoChildConnection() {
   context_->ShutDown();
 }
 
 void MojoChildConnection::SetProcessHandle(base::ProcessHandle handle) {
   context_->SetProcessHandle(handle);
 }
 
 void MojoChildConnection::GetInterface(
     const mojo::String& interface_name,
     mojo::ScopedMessagePipeHandle request_handle) {
   static_cast<shell::mojom::InterfaceProvider*>(&interface_registry_)
       ->GetInterface(interface_name, std::move(request_handle));
 }
 
 }  // namespace content