Split ServiceRegistryAndroid into InterfaceRegistryAndroid and InterfaceProviderAndroid

content/browser/mojo/mojo_child_connection.h

 // Copyright 2016 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.
 
 #ifndef CONTENT_BROWSER_MOJO_MOJO_CHILD_CONNECTION_H_
 #define CONTENT_BROWSER_MOJO_MOJO_CHILD_CONNECTION_H_
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process_handle.h"
 #include "base/sequenced_task_runner.h"
 #include "services/shell/public/cpp/interface_provider.h"
 #include "services/shell/public/cpp/interface_registry.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 
 #if defined(OS_ANDROID)
-#include "content/public/browser/android/service_registry_android.h"
+#include "content/public/browser/android/interface_registry_android.h"
 #endif
 
 namespace shell {
 class Connection;
 class Connector;
 }
 
 namespace content {
 
 // Helper class to establish a connection between the shell and a single child
@@ skipping 24 matching lines @@
   // |switches::kPrimordialPipeToken| in order for the child to initialize its
   // end of the shell connection pipe.
   std::string service_token() const { return service_token_; }
 
   // Sets the child connection's process handle. This should be called as soon
   // as the process has been launched, and the connection will not be fully
   // functional until this is called.
   void SetProcessHandle(base::ProcessHandle handle);
 
 #if defined(OS_ANDROID)
-  ServiceRegistryAndroid* service_registry_android() {
-    return service_registry_android_.get();
+  InterfaceRegistryAndroid* interface_registry_android() {
+    return interface_registry_android_.get();
   }
 #endif
 
  private:
   class IOThreadContext;
 
   void GetInterface(const mojo::String& interface_name,
                     mojo::ScopedMessagePipeHandle request_handle);
 
   scoped_refptr<IOThreadContext> context_;
 
   const std::string service_token_;
 
   shell::InterfaceRegistry interface_registry_;
   shell::InterfaceProvider remote_interfaces_;
 
 #if defined(OS_ANDROID)
-  std::unique_ptr<ServiceRegistryAndroid> service_registry_android_;
+  std::unique_ptr<InterfaceRegistryAndroid> interface_registry_android_;
 #endif
 
   base::WeakPtrFactory<MojoChildConnection> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoChildConnection);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MOJO_MOJO_CHILD_CONNECTION_H_