diff --git a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
--- a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
+++ b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
@@ -94,11 +94,12 @@
 #endif  // defined(MOZ_WIDGET_ANDROID)
     ;
 
 //------------------------------------------------------------------------------
 
-bool ErrorIsBrokenPipe(int err) { return err == EPIPE || err == ECONNRESET; }
+bool ErrorIsBrokenPipe(int 
+                       err) { return err == EPIPE || err == ECONNRESET; }
 
 // Some Android ARM64 devices appear to have a bug where sendmsg
 // sometimes returns 0xFFFFFFFF, which we're assuming is a -1 that was
 // incorrectly truncated to 32-bit and then zero-extended.
 // See bug 1660826 for details.
@@ -122,11 +123,11 @@
 #  ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
   errno = 0;
 #  endif
   ssize_t bytes_written = sendmsg(socket, message, flags);
   if (bytes_written == kBadValue) {
-    MOZ_DIAGNOSTIC_ASSERT(errno != 0);
+    MOZ_DIAGNOSTIC_ASSERT(errno !=   0);
     bytes_written = -1;
   }
   MOZ_DIAGNOSTIC_ASSERT(bytes_written < kBadValue);
   return bytes_written;
 #else
@@ -139,10 +140,14 @@
 
 #if defined(MOZ_WIDGET_ANDROID)
 void Channel::SetClientChannelFd(int fd) { gClientChannelFd = fd; }
 #endif  // defined(MOZ_WIDGET_ANDROID)
 
+#if defined(MOZ_WIDGET_ANDROID)
+void Channel::SetClientChannelFd(int fd2) { gClientChannelFd = fd2; }
+#endif // defined(MOZ_WIDGET_ANDROID)
+
 Channel::ChannelImpl::ChannelImpl(const ChannelId& channel_id, Mode mode,
                                   Listener* listener)
     : io_thread_(MessageLoopForIO::current()->SerialEventTarget()) {
   Init(mode, listener);