Use ChannelMojo for plugin-renderer channels.

content/ppapi_plugin/ppapi_thread.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.
 
 #include "content/ppapi_plugin/ppapi_thread.h"
 
 #include <stddef.h>
 
 #include <limits>
 
@@ skipping 21 matching lines @@
 #include "content/ppapi_plugin/plugin_process_dispatcher.h"
 #include "content/ppapi_plugin/ppapi_blink_platform_impl.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/pepper_plugin_info.h"
 #include "content/public/common/sandbox_init.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_platform_file.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/ipc_sync_message_filter.h"
+#include "mojo/public/cpp/system/message_pipe.h"
 #include "ppapi/c/dev/ppp_network_state_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppp.h"
 #include "ppapi/proxy/interface_list.h"
 #include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_message_filter.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/resource_reply_thread_registrar.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "ui/base/ui_base_switches.h"
@@ skipping 433 matching lines @@
 
 bool PpapiThread::SetupChannel(base::ProcessId renderer_pid,
                                int renderer_child_id,
                                bool incognito,
                                IPC::ChannelHandle* handle) {
   DCHECK(is_broker_ == (connect_instance_func_ != NULL));
   IPC::ChannelHandle plugin_handle;
   plugin_handle.name = IPC::Channel::GenerateVerifiedChannelID(
       base::StringPrintf(
           "%d.r%d", base::GetCurrentProcId(), renderer_child_id));
+  mojo::MessagePipe message_pipe;
+  plugin_handle.mojo_handle = message_pipe.handle0.release();
 
   ppapi::proxy::ProxyChannel* dispatcher = NULL;
   bool init_result = false;
   if (is_broker_) {
     bool peer_is_browser = renderer_pid == base::kNullProcessId;
     BrokerProcessDispatcher* broker_dispatcher =
         new BrokerProcessDispatcher(plugin_entry_points_.get_interface,
                                     connect_instance_func_, peer_is_browser);
     init_result = broker_dispatcher->InitBrokerWithChannel(this,
                                                            renderer_pid,
@@ skipping 12 matching lines @@
                                                            false);
     dispatcher = plugin_dispatcher;
   }
 
   if (!init_result) {
     delete dispatcher;
     return false;
   }
 
   handle->name = plugin_handle.name;
-#if defined(OS_POSIX)
-  // On POSIX, transfer ownership of the renderer-side (client) FD.
-  // This ensures this process will be notified when it is closed even if a
-  // connection is not established.

[dcheng, 2016/06/27 02:12:48]

How come these checks aren't needed in the Mojo version? What makes it
impossible?

[Anand Mistry (off Chromium), 2016/06/27 02:25:59]

fds are not used when using ChannelMojo (and the returned fd will be -1 and
always fail this check). One day when ChannelMojo rules the world,
TakeRendererFD() and ChannelHandle::socket will both be gone.

[dcheng, 2016/06/27 03:35:02]

OK, so the Mojo handles here are always valid?

[Anand Mistry (off Chromium), 2016/06/27 04:52:07]

Here, yes. But not necessarily in the receive side, so I've added a check to
those.

-  handle->socket = base::FileDescriptor(dispatcher->TakeRendererFD());
-  if (handle->socket.fd == -1)
-    return false;
-#endif
+  handle->mojo_handle = message_pipe.handle1.release();
 
   // From here, the dispatcher will manage its own lifetime according to the
   // lifetime of the attached channel.
   return true;
 }
 
 void PpapiThread::SavePluginName(const base::FilePath& path) {
   ppapi::proxy::PluginGlobals::Get()->set_plugin_name(
       path.BaseName().AsUTF8Unsafe());
 }
@@ skipping 42 matching lines @@
           GetHistogramName(is_broker_, "LoadTime", path),
           base::TimeDelta::FromMilliseconds(1),
           base::TimeDelta::FromSeconds(10),
           50,
           base::HistogramBase::kUmaTargetedHistogramFlag);
 
   histogram->AddTime(load_time);
 }
 
 }  // namespace content