Bug 1715144 - Part 1: Stop adding /ipc/glue to LOCAL_INCLUDES when including chromium-config.mozbuild, r=ipc-reviewers,necko-reviewers,mccr8,valentin

Differential Revision: https://phabricator.services.mozilla.com/D117103

docshell/base/ChildProcessChannelListener.h

@@ -14,7 +14,7 @@
 #include "nsDOMNavigationTiming.h"
 #include "nsTHashMap.h"
 #include "nsIChannel.h"
-#include "BackgroundUtils.h"
+#include "mozilla/ipc/BackgroundUtils.h"
 
 namespace mozilla {
 namespace dom {

docshell/base/nsDocShell.cpp

@@ -234,7 +234,7 @@
 #include "mozilla/NullPrincipal.h"
 #include "Navigator.h"
 #include "prenv.h"
-#include "URIUtils.h"
+#include "mozilla/ipc/URIUtils.h"
 #include "sslerr.h"
 #include "mozpkix/pkix.h"
 #include "NSSErrorsService.h"

dom/base/Navigator.cpp

@@ -82,7 +82,7 @@
 
 #include "nsIExternalProtocolHandler.h"
 #include "BrowserChild.h"
-#include "URIUtils.h"
+#include "mozilla/ipc/URIUtils.h"
 
 #include "mozilla/dom/MediaDevices.h"
 #include "MediaManager.h"

dom/clients/manager/ClientManagerParent.cpp

@@ -6,7 +6,7 @@
 
 #include "ClientManagerParent.h"
 
-#include "BackgroundParent.h"
+#include "mozilla/ipc/BackgroundParent.h"
 #include "ClientHandleParent.h"
 #include "ClientManagerOpParent.h"
 #include "ClientManagerService.h"

dom/events/RemoteDragStartData.cpp

@@ -11,7 +11,7 @@
 #include "mozilla/dom/BrowserParent.h"
 #include "mozilla/dom/IPCBlobUtils.h"
 #include "mozilla/dom/DOMTypes.h"
-#include "ProtocolUtils.h"
+#include "mozilla/ipc/ProtocolUtils.h"
 
 using namespace mozilla::ipc;
 

dom/ipc/BrowserChild.cpp

@@ -14,7 +14,6 @@
 #include <algorithm>
 #include <utility>
 
-#include "BackgroundChild.h"
 #include "BrowserParent.h"
 #include "ClientLayerManager.h"
 #include "ContentChild.h"
@@ -81,6 +80,7 @@
 #include "mozilla/gfx/CrossProcessPaint.h"
 #include "mozilla/gfx/Matrix.h"
 #include "mozilla/gfx/gfxVars.h"
+#include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/BackgroundUtils.h"
 #include "mozilla/ipc/PBackgroundChild.h"
 #include "mozilla/ipc/URIUtils.h"

dom/ipc/CSPMessageUtils.cpp

@@ -7,7 +7,7 @@
 #include "mozilla/dom/CSPMessageUtils.h"
 #include "mozilla/ipc/PBackgroundSharedTypes.h"
 #include "nsSerializationHelper.h"
-#include "BackgroundUtils.h"
+#include "mozilla/ipc/BackgroundUtils.h"
 
 namespace IPC {
 

dom/ipc/ContentChild.cpp

@@ -268,8 +268,8 @@
 #include "GMPServiceChild.h"
 #include "GfxInfoBase.h"
 #include "MMPrinter.h"
-#include "ProcessUtils.h"
-#include "URIUtils.h"
+#include "mozilla/ipc/ProcessUtils.h"
+#include "mozilla/ipc/URIUtils.h"
 #include "VRManagerChild.h"
 #include "gfxPlatform.h"
 #include "gfxPlatformFontList.h"

dom/ipc/ContentParent.cpp

@@ -14,7 +14,7 @@
 #include "base/shared_memory.h"
 
 #include "ContentParent.h"
-#include "ProcessUtils.h"
+#include "mozilla/ipc/ProcessUtils.h"
 #include "BrowserParent.h"
 
 #include "chrome/common/process_watcher.h"
@@ -45,7 +45,7 @@
 #include "ProcessPriorityManager.h"
 #include "SandboxHal.h"
 #include "SourceSurfaceRawData.h"
-#include "URIUtils.h"
+#include "mozilla/ipc/URIUtils.h"
 #include "gfxPlatform.h"
 #include "gfxPlatformFontList.h"
 #include "mozilla/AutoRestore.h"

dom/ipc/ContentProcess.cpp

@@ -23,7 +23,7 @@
 #endif
 
 #include "nsAppRunner.h"
-#include "ProcessUtils.h"
+#include "mozilla/ipc/ProcessUtils.h"
 
 using mozilla::ipc::IOThreadChild;
 

dom/ipc/VsyncParent.cpp

@@ -6,12 +6,12 @@
 
 #include "VsyncParent.h"
 
-#include "BackgroundParent.h"
-#include "BackgroundParentImpl.h"
+#include "mozilla/ipc/BackgroundParent.h"
 #include "gfxPlatform.h"
 #include "mozilla/Unused.h"
 #include "nsThreadUtils.h"
 #include "VsyncSource.h"
+#include "nsIThread.h"
 
 namespace mozilla::dom {
 

dom/media/gmp/GMPService.cpp

@@ -12,7 +12,7 @@
 #include "GMPServiceChild.h"
 #include "GMPServiceParent.h"
 #include "GMPVideoDecoderParent.h"
-#include "GeckoChildProcessHost.h"
+#include "mozilla/ipc/GeckoChildProcessHost.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/dom/Document.h"

dom/media/gmp/GMPServiceParent.cpp

@@ -11,7 +11,7 @@
 #include "GMPLog.h"
 #include "GMPParent.h"
 #include "GMPVideoDecoderParent.h"
-#include "GeckoChildProcessHost.h"
+#include "mozilla/ipc/GeckoChildProcessHost.h"
 #include "base/task.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/Logging.h"

dom/media/ipc/RDDParent.cpp

@@ -46,7 +46,7 @@
 #  include "nsMacUtilsImpl.h"
 #endif
 
-#include "ProcessUtils.h"
+#include "mozilla/ipc/ProcessUtils.h"
 #include "nsDebugImpl.h"
 #include "nsThreadManager.h"
 

dom/media/ipc/RDDProcessHost.cpp

@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "RDDProcessHost.h"
 
-#include "ProcessUtils.h"
+#include "mozilla/ipc/ProcessUtils.h"
 #include "RDDChild.h"
 #include "chrome/common/process_watcher.h"
 #include "mozilla/Preferences.h"

dom/media/ipc/RDDProcessImpl.cpp

@@ -11,7 +11,7 @@
 #  include "mozilla/sandboxTarget.h"
 #endif
 
-#include "ProcessUtils.h"
+#include "mozilla/ipc/ProcessUtils.h"
 
 namespace mozilla {
 

dom/midi/MIDIAccess.cpp

@@ -23,7 +23,7 @@
 #include "nsPIDOMWindow.h"
 #include "nsContentPermissionHelper.h"
 #include "nsISupportsImpl.h"  // for MOZ_COUNT_CTOR, MOZ_COUNT_DTOR
-#include "IPCMessageUtils.h"
+#include "ipc/IPCMessageUtils.h"
 
 namespace mozilla::dom {
 

dom/quota/Client.cpp

@@ -7,7 +7,7 @@
 #include "Client.h"
 
 // Global includes
-#include "BackgroundParent.h"
+#include "mozilla/ipc/BackgroundParent.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/dom/quota/QuotaManager.h"
 

gfx/ipc/GPUParent.cpp

@@ -14,7 +14,6 @@
 #include "GPUProcessManager.h"
 #include "gfxGradientCache.h"
 #include "GfxInfoBase.h"
-#include "ProcessUtils.h"
 #include "VRGPUChild.h"
 #include "VRManager.h"
 #include "VRManagerParent.h"
@@ -41,6 +40,7 @@
 #include "mozilla/image/ImageMemoryReporter.h"
 #include "mozilla/ipc/CrashReporterClient.h"
 #include "mozilla/ipc/ProcessChild.h"
+#include "mozilla/ipc/ProcessUtils.h"
 #include "mozilla/layers/APZInputBridgeParent.h"
 #include "mozilla/layers/APZPublicUtils.h"  // for apz::InitializeGlobalState
 #include "mozilla/layers/APZThreadUtils.h"

gfx/ipc/GPUProcessHost.cpp

@@ -12,7 +12,7 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs_layers.h"
 #include "VRGPUChild.h"
-#include "ProcessUtils.h"
+#include "mozilla/ipc/ProcessUtils.h"
 
 namespace mozilla {
 namespace gfx {

gfx/ipc/GPUProcessImpl.cpp

@@ -6,7 +6,7 @@
 #include "GPUProcessImpl.h"
 #include "mozilla/ipc/IOThreadChild.h"
 #include "nsXPCOM.h"
-#include "ProcessUtils.h"
+#include "mozilla/ipc/ProcessUtils.h"
 
 #if defined(OS_WIN) && defined(MOZ_SANDBOX)
 #  include "mozilla/sandboxTarget.h"

gfx/layers/TextureSync.h

@@ -12,7 +12,7 @@
 #include "nsTArray.h"
 #include "mozilla/layers/TextureSourceProvider.h"
 
-#include "SharedMemory.h"
+#include "mozilla/ipc/SharedMemory.h"
 
 class MachReceiveMessage;
 

gfx/layers/apz/src/AsyncPanZoomController.cpp

@@ -82,13 +82,13 @@
 #include "nsPoint.h"      // for nsIntPoint
 #include "nsStyleConsts.h"
 #include "nsTimingFunction.h"
-#include "nsTArray.h"                // for nsTArray, nsTArray_Impl, etc
-#include "nsThreadUtils.h"           // for NS_IsMainThread
-#include "nsViewportInfo.h"          // for kViewportMinScale, kViewportMaxScale
-#include "prsystem.h"                // for PR_GetPhysicalMemorySize
-#include "SharedMemoryBasic.h"       // for SharedMemoryBasic
-#include "ScrollSnap.h"              // for ScrollSnapUtils
-#include "ScrollAnimationPhysics.h"  // for ComputeAcceleratedWheelDelta
+#include "nsTArray.h"        // for nsTArray, nsTArray_Impl, etc
+#include "nsThreadUtils.h"   // for NS_IsMainThread
+#include "nsViewportInfo.h"  // for kViewportMinScale, kViewportMaxScale
+#include "prsystem.h"        // for PR_GetPhysicalMemorySize
+#include "mozilla/ipc/SharedMemoryBasic.h"  // for SharedMemoryBasic
+#include "ScrollSnap.h"                     // for ScrollSnapUtils
+#include "ScrollAnimationPhysics.h"         // for ComputeAcceleratedWheelDelta
 #include "SmoothMsdScrollAnimation.h"
 #include "SmoothScrollAnimation.h"
 #include "WheelScrollAnimation.h"

gfx/layers/apz/src/AsyncPanZoomController.h

@@ -7,7 +7,7 @@
 #ifndef mozilla_layers_AsyncPanZoomController_h
 #define mozilla_layers_AsyncPanZoomController_h
 
-#include "CrossProcessMutex.h"
+#include "mozilla/ipc/CrossProcessMutex.h"
 #include "mozilla/layers/GeckoContentController.h"
 #include "mozilla/layers/RepaintRequest.h"
 #include "mozilla/layers/SampleTime.h"

gfx/layers/ipc/SharedRGBImage.cpp

@@ -6,7 +6,7 @@
 
 #include "SharedRGBImage.h"
 #include "ImageTypes.h"         // for ImageFormat::SHARED_RGB, etc
-#include "Shmem.h"              // for Shmem
+#include "mozilla/ipc/Shmem.h"  // for Shmem
 #include "gfx2DGlue.h"          // for ImageFormatToSurfaceFormat, etc
 #include "gfxPlatform.h"        // for gfxPlatform, gfxImageFormat
 #include "mozilla/gfx/Point.h"  // for IntSIze

gfx/vr/ipc/VRParent.cpp

@@ -9,12 +9,12 @@
 #include "gfxConfig.h"
 #include "nsDebugImpl.h"
 #include "nsThreadManager.h"
-#include "ProcessUtils.h"
 
 #include "mozilla/dom/MemoryReportRequest.h"
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/ipc/CrashReporterClient.h"
 #include "mozilla/ipc/ProcessChild.h"
+#include "mozilla/ipc/ProcessUtils.h"
 #include "mozilla/Preferences.h"
 
 #if defined(XP_WIN)

gfx/vr/ipc/VRProcessChild.cpp

@@ -8,7 +8,7 @@
 
 #include "mozilla/BackgroundHangMonitor.h"
 #include "mozilla/ipc/IOThreadChild.h"
-#include "ProcessUtils.h"
+#include "mozilla/ipc/ProcessUtils.h"
 
 using namespace mozilla;
 using namespace mozilla::gfx;

gfx/vr/ipc/VRProcessParent.cpp

@@ -11,12 +11,12 @@
 #include "mozilla/gfx/GPUProcessManager.h"
 #include "mozilla/gfx/GPUChild.h"
 #include "mozilla/ipc/Endpoint.h"
+#include "mozilla/ipc/ProcessUtils.h"
 #include "mozilla/ipc/ProtocolTypes.h"
 #include "mozilla/ipc/ProtocolUtils.h"  // for IToplevelProtocol
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/TimeStamp.h"  // for TimeStamp
 #include "mozilla/Unused.h"
-#include "ProcessUtils.h"
 #include "VRChild.h"
 #include "VRThread.h"
 

ipc/chromium/chromium-config.mozbuild

@@ -7,7 +7,6 @@
 LOCAL_INCLUDES += [
     '!/ipc/ipdl/_ipdlheaders',
     '/ipc/chromium/src',
-    '/ipc/glue',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':

ipc/chromium/src/base/message_loop.cc

@@ -38,7 +38,7 @@
 #  include "TracedTaskCommon.h"
 #endif
 
-#include "MessagePump.h"
+#include "mozilla/ipc/MessagePump.h"
 #include "nsThreadUtils.h"
 
 using base::Time;

ipc/chromium/src/base/process_util_linux.cc

@@ -30,7 +30,7 @@
 
 #  include "mozilla/Unused.h"
 #  include "mozilla/ScopeExit.h"
-#  include "ProcessUtils.h"
+#  include "mozilla/ipc/ProcessUtils.h"
 
 using namespace mozilla::ipc;
 #endif

ipc/chromium/src/chrome/common/ipc_channel_utils.h

@@ -8,7 +8,7 @@
 #define CHROME_COMMON_IPC_CHANNEL_UTILS_H_
 
 #include "chrome/common/ipc_message.h"
-#include "MessageChannel.h"
+#include "mozilla/ipc/MessageChannel.h"
 
 namespace IPC {
 

ipc/glue/BackgroundUtils.cpp

@@ -24,7 +24,6 @@
 #include "nsString.h"
 #include "nsTArray.h"
 #include "mozilla/nsRedirectHistoryEntry.h"
-#include "URIUtils.h"
 #include "mozilla/dom/nsCSPUtils.h"
 #include "mozilla/dom/nsCSPContext.h"
 #include "mozilla/dom/BrowsingContext.h"

ipc/glue/CrashReporterHost.h

@@ -13,7 +13,7 @@
 #include "base/process.h"
 #include "nsExceptionHandler.h"
 #include "nsThreadUtils.h"
-#include "ProtocolUtils.h"
+#include "mozilla/ipc/ProtocolUtils.h"
 
 namespace mozilla {
 namespace ipc {

ipc/glue/CrossProcessMutex.h

@@ -12,7 +12,7 @@
 
 #if !defined(OS_WIN) && !defined(OS_NETBSD) && !defined(OS_OPENBSD)
 #  include <pthread.h>
-#  include "SharedMemoryBasic.h"
+#  include "mozilla/ipc/SharedMemoryBasic.h"
 #  include "mozilla/Atomics.h"
 #endif
 

ipc/glue/CrossProcessSemaphore.h

@@ -14,7 +14,7 @@
 #if !defined(OS_WIN) && !defined(OS_MACOSX)
 #  include <pthread.h>
 #  include <semaphore.h>
-#  include "SharedMemoryBasic.h"
+#  include "mozilla/ipc/SharedMemoryBasic.h"
 #  include "mozilla/Atomics.h"
 #endif
 

ipc/glue/GeckoChildProcessHost.cpp

@@ -723,7 +723,7 @@ bool GeckoChildProcessHost::AsyncLaunch(std::vector<std::string> aExtraOpts) {
               [this](const LaunchResults& aResults) {
                 {
                   if (!OpenPrivilegedHandle(base::GetProcId(aResults.mHandle))
-#ifdef XP_WIN
+                          #ifdef XP_WIN
                       // If we failed in opening the process handle, try harder
                       // by duplicating one.
                       && !::DuplicateHandle(

ipc/glue/IPCMessageUtils.cpp

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "IPCMessageUtils.h"
+#include "ipc/IPCMessageUtils.h"
 
 #include <cstddef>
 #include "mozilla/CheckedInt.h"

ipc/glue/ProcessUtils.h

@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "FileDescriptor.h"
+#include "mozilla/ipc/FileDescriptor.h"
 #include "base/shared_memory.h"
 #include "mozilla/Maybe.h"
 

ipc/glue/SharedMemoryBasic_android.h

@@ -9,10 +9,10 @@
 
 #include "base/file_descriptor_posix.h"
 
-#include "SharedMemory.h"
+#include "mozilla/ipc/SharedMemory.h"
 
 #ifdef FUZZING
-#  include "SharedMemoryFuzzer.h"
+#  include "mozilla/ipc/SharedMemoryFuzzer.h"
 #endif
 
 //

ipc/glue/SharedMemoryBasic_chromium.h

@@ -8,10 +8,10 @@
 #define mozilla_ipc_SharedMemoryBasic_chromium_h
 
 #include "base/shared_memory.h"
-#include "SharedMemory.h"
+#include "mozilla/ipc/SharedMemory.h"
 
 #ifdef FUZZING
-#  include "SharedMemoryFuzzer.h"
+#  include "mozilla/ipc/SharedMemoryFuzzer.h"
 #endif
 
 #include "nsDebug.h"

ipc/glue/SharedMemoryBasic_mach.h

@@ -10,12 +10,12 @@
 #include "base/file_descriptor_posix.h"
 #include "base/process.h"
 
-#include "SharedMemory.h"
+#include "mozilla/ipc/SharedMemory.h"
 #include <mach/port.h>
 #include "chrome/common/mach_ipc_mac.h"
 
 #ifdef FUZZING
-#  include "SharedMemoryFuzzer.h"
+#  include "mozilla/ipc/SharedMemoryFuzzer.h"
 #endif
 
 //

ipc/glue/Transport_posix.cpp

@@ -13,7 +13,7 @@
 #include "mozilla/ipc/Endpoint.h"
 #include "mozilla/ipc/Transport.h"
 #include "mozilla/ipc/FileDescriptor.h"
-#include "ProtocolUtils.h"
+#include "mozilla/ipc/ProtocolUtils.h"
 
 using base::ProcessHandle;
 

ipc/glue/moz.build

@@ -42,8 +42,10 @@ EXPORTS.mozilla.ipc += [
     "LibrarySandboxPreload.h",
     "MessageChannel.h",
     "MessageLink.h",
+    "MessagePump.h",
     "Neutering.h",
     "ProcessChild.h",
+    "ProcessUtils.h",
     "ProtocolMessageUtils.h",
     "ProtocolUtils.h",
     "ProtocolUtilsFwd.h",

layout/base/nsRefreshDriver.cpp

@@ -77,7 +77,7 @@
 #include "mozilla/ScopeExit.h"
 #include "mozilla/Telemetry.h"
 
-#include "BackgroundChild.h"
+#include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/ipc/PBackgroundChild.h"
 #include "VsyncSource.h"
 #include "mozilla/VsyncDispatcher.h"

netwerk/base/nsSimpleURI.cpp

@@ -6,7 +6,7 @@
 #include "mozilla/DebugOnly.h"
 
 #undef LOG
-#include "IPCMessageUtils.h"
+#include "ipc/IPCMessageUtils.h"
 
 #include "nsSimpleURI.h"
 #include "nscore.h"

netwerk/base/nsStandardURL.cpp

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "IPCMessageUtils.h"
+#include "ipc/IPCMessageUtils.h"
 
 #include "nsASCIIMask.h"
 #include "nsStandardURL.h"

netwerk/ipc/ParentProcessDocumentChannel.h

@@ -7,7 +7,7 @@
 #ifndef mozilla_net_ParentProcessDocumentChannel_h
 #define mozilla_net_ParentProcessDocumentChannel_h
 
-#include "ProtocolUtils.h"
+#include "mozilla/ipc/ProtocolUtils.h"
 #include "mozilla/net/DocumentChannel.h"
 #include "mozilla/net/DocumentLoadListener.h"
 #include "nsIObserver.h"

netwerk/ipc/SocketProcessChild.cpp

@@ -28,6 +28,7 @@
 #include "mozilla/net/TRRServiceChild.h"
 #include "mozilla/ipc/PChildToParentStreamChild.h"
 #include "mozilla/ipc/PParentToChildStreamChild.h"
+#include "mozilla/ipc/ProcessUtils.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/RemoteLazyInputStreamChild.h"
 #include "mozilla/Telemetry.h"
@@ -40,7 +41,6 @@
 #include "nsNSSComponent.h"
 #include "nsSocketTransportService2.h"
 #include "nsThreadManager.h"
-#include "ProcessUtils.h"
 #include "SocketProcessBridgeParent.h"
 
 #if defined(XP_WIN)

netwerk/ipc/SocketProcessHost.cpp

@@ -5,9 +5,9 @@
 
 #include "SocketProcessHost.h"
 
-#include "ProcessUtils.h"
 #include "SocketProcessParent.h"
 #include "mozilla/ipc/FileDescriptor.h"
+#include "mozilla/ipc/ProcessUtils.h"
 #include "nsAppRunner.h"
 #include "nsIOService.h"
 #include "nsIObserverService.h"

netwerk/ipc/SocketProcessImpl.cpp

@@ -5,13 +5,12 @@
 
 #include "SocketProcessImpl.h"
 
-#include "ProcessUtils.h"
 #include "base/command_line.h"
 #include "base/shared_memory.h"
 #include "base/string_util.h"
 #include "mozilla/BackgroundHangMonitor.h"
 #include "mozilla/Preferences.h"
-#include "ProcessUtils.h"
+#include "mozilla/ipc/ProcessUtils.h"
 #include "mozilla/ipc/IOThreadChild.h"
 
 #if defined(OS_WIN) && defined(MOZ_SANDBOX)

netwerk/protocol/res/ExtensionProtocolHandler.cpp

@@ -13,13 +13,13 @@
 #include "mozilla/dom/Promise-inl.h"
 #include "mozilla/ExtensionPolicyService.h"
 #include "mozilla/FileUtils.h"
+#include "mozilla/ipc/FileDescriptor.h"
 #include "mozilla/ipc/IPCStreamUtils.h"
 #include "mozilla/ipc/URIUtils.h"
 #include "mozilla/net/NeckoChild.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/ResultExtensions.h"
 
-#include "FileDescriptor.h"
 #include "FileDescriptorFile.h"
 #include "LoadInfo.h"
 #include "nsContentUtils.h"

toolkit/xre/nsEmbedFunctions.cpp

@@ -50,7 +50,7 @@
 #if defined(MOZ_WIDGET_ANDROID)
 #  include "chrome/common/ipc_channel.h"
 #  include "mozilla/jni/Utils.h"
-#  include "ProcessUtils.h"
+#  include "mozilla/ipc/ProcessUtils.h"
 #endif  //  defined(MOZ_WIDGET_ANDROID)
 
 #include "mozilla/AbstractThread.h"