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 472 matching lines @@
   for (;;)
     base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1));
 }
 
 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(
+  IPC::Channel::GenerateMojoChannelHandlePair(
       base::StringPrintf(
-          "%d.r%d", base::GetCurrentProcId(), renderer_child_id));
+          "plugin-%d.r%d", base::GetCurrentProcId(), renderer_child_id),
+      &plugin_handle, handle);
 
   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,
                                                            plugin_handle,
                                                            false);
     dispatcher = broker_dispatcher;
   } else {
     DCHECK_NE(base::kNullProcessId, renderer_pid);
     PluginProcessDispatcher* plugin_dispatcher =
         new PluginProcessDispatcher(plugin_entry_points_.get_interface,
                                     permissions_,
                                     incognito);
     init_result = plugin_dispatcher->InitPluginWithChannel(this,
                                                            renderer_pid,
                                                            plugin_handle,
                                                            false);
     dispatcher = plugin_dispatcher;
   }
 
   if (!init_result) {
+    handle->mojo_handle.Close();
     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.
-  handle->socket = base::FileDescriptor(dispatcher->TakeRendererFD());
-  if (handle->socket.fd == -1)
-    return false;
-#endif
-
   // 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 41 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