Use ChannelMojo for NaCl PPAPI channels.

components/nacl/browser/nacl_process_host.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 "components/nacl/browser/nacl_process_host.h"
 
 #include <string.h>
 #include <algorithm>
 #include <string>
 #include <utility>
@@ skipping 237 matching lines @@
     CHECK(handle.socket.fd == -1 || handle.socket.fd != handle_.socket.fd);
 #endif
     CloseIfNecessary();
     handle_ = handle;
   }
 
  private:
   // Returns true if the given handle is closable automatically by this
   // class. This function is just a helper for validation.
   static bool IsSupportedHandle(const IPC::ChannelHandle& handle) {
-#if defined(OS_WIN)
+#if defined(OS_POSIX)
+    // Only ChannelMojo is supported.

[Mark Seaborn, 2016/10/12 00:57:24]

It looks like this comment should apply to Windows too.

[Sam McNally, 2016/10/12 03:15:32]

Done.

+    return handle.socket.fd == -1;
+#elif defined(OS_WIN)
     // On Windows, it is not supported to marshal the |pipe.handle|.
     // In our case, we wrap a transferred ChannelHandle (or one to be
     // transferred) via IPC, so we can assume |handle.pipe.handle| is NULL.
     return handle.pipe.handle == NULL;
 #else
     return true;
-#endif
+#endif  // defined(OS_POSIX)
   }
 
   void CloseIfNecessary() {
+    if (handle_.mojo_handle.is_valid())
+      handle_.mojo_handle.Close();
+
 #if defined(OS_POSIX)

[Mark Seaborn, 2016/10/12 00:57:24]

This block shouldn't be necessary if "Only ChannelMojo is supported" as noted
above.

[Sam McNally, 2016/10/12 03:15:32]

Done.

     if (handle_.socket.auto_close) {
       // Defer closing task to the ScopedFD.
       base::ScopedFD(handle_.socket.fd);
     }
 #endif
   }
 
   IPC::ChannelHandle handle_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedChannelHandle);
@@ skipping 747 matching lines @@
 }
 
 #if defined(OS_LINUX)
 // static
 bool NaClProcessHost::CreateChannelHandlePair(
     ScopedChannelHandle* channel_handle1,
     ScopedChannelHandle* channel_handle2) {
   DCHECK(channel_handle1);
   DCHECK(channel_handle2);
 
-  int fd1 = -1;
-  int fd2 = -1;
-  if (!IPC::SocketPair(&fd1, &fd2)) {
-    return false;
-  }
+  IPC::ChannelHandle handle1;
+  IPC::ChannelHandle handle2;
+  IPC::Channel::GenerateMojoChannelHandlePair("NaCl", &handle1, &handle2);
+  channel_handle1->reset(handle1);
+  channel_handle2->reset(handle2);
 
-  IPC::ChannelHandle handle = IPC::Channel::GenerateVerifiedChannelID("nacl");
-  handle.socket = base::FileDescriptor(fd1, true);
-  channel_handle1->reset(handle);
-  handle.socket = base::FileDescriptor(fd2, true);
-  channel_handle2->reset(handle);
   return true;
 }
 #endif
 
 bool NaClProcessHost::StartPPAPIProxy(ScopedChannelHandle channel_handle) {
   if (ipc_proxy_channel_.get()) {
     // Attempt to open more than 1 browser channel is not supported.
     // Shut down the NaCl process.
     process_->GetHost()->ForceShutdown();
     return false;
@@ skipping 241 matching lines @@
     NaClStartDebugExceptionHandlerThread(
         std::move(process), info, base::ThreadTaskRunnerHandle::Get(),
         base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
                    weak_factory_.GetWeakPtr()));
     return true;
   }
 }
 #endif
 
 }  // namespace nacl