Revert of Make RenderProcessHost/RenderThread use MojoChildConnection/MojoShellConnection

content/browser/mojo/mojo_child_connection.h

Index: content/browser/mojo/mojo_child_connection.h
diff --git a/content/browser/mojo/mojo_child_connection.h b/content/browser/mojo/mojo_child_connection.h
index 7227284cc160b99725e30a55d01eb982d8315750..1cb07cafb1d6bf081784f96827cc17d9df6cd027 100644
--- a/content/browser/mojo/mojo_child_connection.h
+++ b/content/browser/mojo/mojo_child_connection.h
@@ -11,10 +11,6 @@
 #include "base/macros.h"
 #include "base/process/process_handle.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
-
-#if defined(OS_ANDROID)
-#include "content/public/browser/android/service_registry_android.h"
-#endif
 
 namespace shell {
 class Connection;
@@ -52,19 +48,10 @@
   // functional until this is called.
   void SetProcessHandle(base::ProcessHandle handle);
 
-#if defined(OS_ANDROID)
-  ServiceRegistryAndroid* service_registry_android() {
-    return service_registry_android_.get();
-  }
-#endif
-
  private:
   const std::string shell_client_token_;
   std::unique_ptr<shell::Connection> connection_;
   shell::mojom::PIDReceiverPtr pid_receiver_;
-#if defined(OS_ANDROID)
-  std::unique_ptr<ServiceRegistryAndroid> service_registry_android_;
-#endif
 
   DISALLOW_COPY_AND_ASSIGN(MojoChildConnection);
 };