Revert of Adds the ability for the renderer to create the mojo channel

content/browser/renderer_host/render_process_host_impl.cc

Index: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 35b5e9c67d3991b93d01af5ff4b50c01e80383fe..5b9409602e2a2faf21e8551c846871ed17005dd4 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -138,7 +138,6 @@
 #include "media/base/media_switches.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ppapi/shared_impl/ppapi_switches.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/events/event_switches.h"
 #include "ui/gfx/switches.h"
@@ -159,12 +158,7 @@
 #include "content/common/media/media_stream_messages.h"
 #endif
 
-// TODO(sky): remove, see header for details.
-#if !defined(OS_MACOSX)
-#include "content/common/mojo/mojo_channel_init.h"
-#include "content/common/mojo/mojo_messages.h"
-#include "mojo/system/embedder/platform_channel_pair.h"
-#endif
+#include "third_party/skia/include/core/SkBitmap.h"
 
 extern bool g_exited_main_message_loop;
 
@@ -330,18 +324,6 @@
   int ipc_fd_;
 #endif  // OS_POSIX
 };
-
-// TODO(sky): remove, see header for details.
-#if !defined(OS_MACOSX)
-base::PlatformFile PlatformFileFromScopedPlatformHandle(
-    mojo::embedder::ScopedPlatformHandle handle) {
-#if defined(OS_POSIX)
-  return handle.release().fd;
-#elif defined(OS_WIN)
-  return handle.release().handle;
-#endif
-}
-#endif
 
 }  // namespace
 
@@ -440,9 +422,9 @@
       within_process_died_observer_(false),
       power_monitor_broadcaster_(this),
       geolocation_dispatcher_host_(NULL),
+      weak_factory_(this),
       screen_orientation_dispatcher_host_(NULL),
-      worker_ref_count_(0),
-      weak_factory_(this) {
+      worker_ref_count_(0) {
   widget_helper_ = new RenderWidgetHelper();
 
   ChildProcessSecurityPolicyImpl::GetInstance()->Add(GetID());
@@ -2155,27 +2137,4 @@
     Cleanup();
 }
 
-void RenderProcessHostImpl::CreateMojoChannel() {
-// TODO(sky): remove, see header for details.
-#if !defined(OS_MACOSX)
-  if (mojo_channel_init_.get())
-    return;
-
-  mojo::embedder::PlatformChannelPair channel_pair;
-  mojo_channel_init_.reset(new MojoChannelInit);
-  mojo_channel_init_->Init(
-      PlatformFileFromScopedPlatformHandle(channel_pair.PassServerHandle()),
-      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
-  if (mojo_channel_init_->is_handle_valid()) {
-    base::ProcessHandle process_handle = run_renderer_in_process() ?
-        base::Process::Current().handle() :
-        child_process_launcher_->GetHandle();
-    base::PlatformFile client_file =
-        PlatformFileFromScopedPlatformHandle(channel_pair.PassClientHandle());
-    Send(new MojoMsg_ChannelCreated(
-             IPC::GetFileHandleForProcess(client_file, process_handle, true)));
-  }
-#endif
-}
-
 }  // namespace content