Revert 258763 "Adds plumbing to pass WebUI mojo::Handle from bro..."

trunk/src/content/browser/renderer_host/render_process_host_impl.cc

 // Copyright (c) 2012 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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/render_process_host_impl.h"
 
 #include <algorithm>
@@ skipping 143 matching lines @@
 #endif
 
 #if defined(ENABLE_WEBRTC)
 #include "content/browser/media/webrtc_internals.h"
 #include "content/browser/renderer_host/media/media_stream_track_metrics_host.h"
 #include "content/browser/renderer_host/media/webrtc_identity_service_host.h"
 #include "content/common/media/media_stream_messages.h"
 #endif
 
 #if defined(USE_MOJO)
-#include "content/browser/renderer_host/render_process_host_mojo_impl.h"
+#include "content/common/mojo/mojo_channel_init.h"
+#include "content/common/mojo/mojo_messages.h"
+#include "mojo/embedder/platform_channel_pair.h"
 #endif
 
 extern bool g_exited_main_message_loop;
 
 static const char* kSiteProcessMapKeyName = "content_site_process_map";
 
 namespace content {
 namespace {
 
 void CacheShaderInfo(int32 id, base::FilePath path) {
@@ skipping 147 matching lines @@
     return ipc_fd_;
   }
 #endif  // OS_WIN
 
  private:
 #if defined(OS_POSIX)
   int ipc_fd_;
 #endif  // OS_POSIX
 };
 
+#if defined(USE_MOJO)
+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
 
 RendererMainThreadFactoryFunction g_renderer_main_thread_factory = NULL;
 
 void RenderProcessHost::RegisterRendererMainThreadFactory(
     RendererMainThreadFactoryFunction create) {
   g_renderer_main_thread_factory = create;
 }
 
 base::MessageLoop* g_in_process_thread;
@@ skipping 1579 matching lines @@
   while (!iter.IsAtEnd()) {
     iter.GetCurrentValue()->OnMessageReceived(
         ViewHostMsg_RenderProcessGone(iter.GetCurrentKey(),
                                       static_cast<int>(status),
                                       exit_code));
     iter.Advance();
   }
 
   ClearTransportDIBCache();
 
-#if defined(USE_MOJO)
-  render_process_host_mojo_.reset();
-#endif
-
   // It's possible that one of the calls out to the observers might have caused
   // this object to be no longer needed.
   if (delayed_cleanup_needed_)
     Cleanup();
 
   // This object is not deleted at this point and might be reused later.
   // TODO(darin): clean this up
 }
 
 int RenderProcessHostImpl::GetActiveViewCount() {
@@ skipping 122 matching lines @@
 
   while (!queued_messages_.empty()) {
     Send(queued_messages_.front());
     queued_messages_.pop();
   }
 
 #if defined(ENABLE_WEBRTC)
   if (WebRTCInternals::GetInstance()->aec_dump_enabled())
     EnableAecDump(WebRTCInternals::GetInstance()->aec_dump_file_path());
 #endif
-
-#if defined(USE_MOJO)
-  if (render_process_host_mojo_.get())
-    render_process_host_mojo_->OnProcessLaunched();
-#endif
 }
 
 scoped_refptr<AudioRendererHost>
 RenderProcessHostImpl::audio_renderer_host() const {
   return audio_renderer_host_;
 }
 
 void RenderProcessHostImpl::OnUserMetricsRecordAction(
     const std::string& action) {
   RecordComputedAction(action);
@@ skipping 54 matching lines @@
 
 void RenderProcessHostImpl::DecrementWorkerRefCount() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_GT(worker_ref_count_, 0);
   --worker_ref_count_;
   if (worker_ref_count_ == 0)
     Cleanup();
 }
 
 #if defined(USE_MOJO)
-void RenderProcessHostImpl::SetWebUIHandle(
-int32 view_routing_id,
-mojo::ScopedMessagePipeHandle handle) {
-  if (!render_process_host_mojo_)
-    render_process_host_mojo_.reset(new RenderProcessHostMojoImpl(this));
-  render_process_host_mojo_->SetWebUIHandle(view_routing_id, handle.Pass());
+void RenderProcessHostImpl::CreateMojoChannel() {
+  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