From b0d3610965f915a1041524948983b2203dc53dd6 Mon Sep 17 00:00:00 2001
From: serge-sans-paille <sguelton@mozilla.com>
Date: Fri, 31 Mar 2023 13:29:44 +0000
Subject: [PATCH] Bug 1825327 - Make ipc/chromium buildable outside of a
 unified build environment r=andi

Depends on D173970

Differential Revision: https://phabricator.services.mozilla.com/D173971
---
 ipc/chromium/moz.build                              |  2 --
 ipc/chromium/src/base/condition_variable_posix.cc   |  1 +
 ipc/chromium/src/base/message_loop.cc               | 12 ------------
 ipc/chromium/src/base/pickle.cc                     |  4 ----
 ipc/chromium/src/base/process_util_mac.mm           |  1 +
 ipc/chromium/src/base/process_util_posix.cc         |  2 --
 ipc/chromium/src/chrome/common/ipc_channel_utils.cc |  1 +
 7 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build
index f6e84a139dbb..fe57b9f6ac32 100644
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -134,5 +134,3 @@ TEST_DIRS += [
 include("/ipc/chromium/chromium-config.mozbuild")
 
 FINAL_LIBRARY = "xul"
-
-REQUIRES_UNIFIED_BUILD = True
diff --git a/ipc/chromium/src/base/condition_variable_posix.cc b/ipc/chromium/src/base/condition_variable_posix.cc
index aeb699541ca4..891555389e12 100644
--- a/ipc/chromium/src/base/condition_variable_posix.cc
+++ b/ipc/chromium/src/base/condition_variable_posix.cc
@@ -11,6 +11,7 @@
 #include <sys/time.h>
 
 #include "base/lock.h"
+#include "base/logging.h"
 #include "base/time.h"
 #include "build/build_config.h"
 
diff --git a/ipc/chromium/src/base/message_loop.cc b/ipc/chromium/src/base/message_loop.cc
index 1fe853c408f0..d0b82e998869 100644
--- a/ipc/chromium/src/base/message_loop.cc
+++ b/ipc/chromium/src/base/message_loop.cc
@@ -52,18 +52,6 @@ static base::ThreadLocalPointer<MessageLoop>& get_tls_ptr() {
 
 //------------------------------------------------------------------------------
 
-// Logical events for Histogram profiling. Run with -message-loop-histogrammer
-// to get an accounting of messages and actions taken on each thread.
-static const int kTaskRunEvent = 0x1;
-static const int kTimerEvent = 0x2;
-
-// Provide range of message IDs for use in histogramming and debug display.
-static const int kLeastNonZeroMessageId = 1;
-static const int kMaxMessageId = 1099;
-static const int kNumberOfDistinctMessagesDisplayed = 1100;
-
-//------------------------------------------------------------------------------
-
 #if defined(OS_WIN)
 
 // Upon a SEH exception in this thread, it restores the original unhandled
diff --git a/ipc/chromium/src/base/pickle.cc b/ipc/chromium/src/base/pickle.cc
index 75a605eee8b9..1b676c9c87e6 100644
--- a/ipc/chromium/src/base/pickle.cc
+++ b/ipc/chromium/src/base/pickle.cc
@@ -32,10 +32,6 @@ static const uint32_t kDefaultSegmentCapacity = 4096;
 
 static const char kBytePaddingMarker = char(0xbf);
 
-// Note: we round the time to the nearest millisecond. So a min value of 1 ms
-// actually captures from 500us and above.
-static const uint32_t kMinTelemetryIPCReadLatencyMs = 1;
-
 namespace {
 
 // We want to copy data to our payload as efficiently as possible.
diff --git a/ipc/chromium/src/base/process_util_mac.mm b/ipc/chromium/src/base/process_util_mac.mm
index 296b78da4170..56f7eae92681 100644
--- a/ipc/chromium/src/base/process_util_mac.mm
+++ b/ipc/chromium/src/base/process_util_mac.mm
@@ -10,6 +10,7 @@
 #include <os/availability.h>
 #include <spawn.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 #include <string>
 
diff --git a/ipc/chromium/src/base/process_util_posix.cc b/ipc/chromium/src/base/process_util_posix.cc
index e5fbbbae0a2a..126fe96e705a 100644
--- a/ipc/chromium/src/base/process_util_posix.cc
+++ b/ipc/chromium/src/base/process_util_posix.cc
@@ -47,8 +47,6 @@
 #  define HAVE_WAITID
 #endif
 
-const int kMicrosecondsPerSecond = 1000000;
-
 namespace base {
 
 ProcessId GetCurrentProcId() { return getpid(); }
diff --git a/ipc/chromium/src/chrome/common/ipc_channel_utils.cc b/ipc/chromium/src/chrome/common/ipc_channel_utils.cc
index a76ee1d0fc53..7e737762f3d1 100644
--- a/ipc/chromium/src/chrome/common/ipc_channel_utils.cc
+++ b/ipc/chromium/src/chrome/common/ipc_channel_utils.cc
@@ -8,6 +8,7 @@
 
 #include "mozilla/ProfilerMarkers.h"
 #include "chrome/common/ipc_message.h"
+#include "base/process.h"
 
 namespace IPC {
 
-- 
2.11.4.GIT