Revert of Make RenderProcessHost/RenderThread use MojoChildConnection/MojoShellConnection

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/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;
 class Connector;
 }
 
 namespace content {
 
 // Helper class to establish a connection between the shell and a single child
 // process. Process hosts can use this when launching new processes which
 // should be registered with the shell.
@@ skipping 16 matching lines @@
   // A token which must be passed to the child process via
   // |switches::kPrimordialPipeToken| in order for the child to initialize its
   // end of the shell connection pipe.
   std::string shell_client_token() const { return shell_client_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();
-  }
-#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);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MOJO_MOJO_CHILD_CONNECTION_H_