Index: third_party/mojo/src/mojo/edk/embedder/embedder_internal.h |
diff --git a/third_party/mojo/src/mojo/edk/embedder/embedder_internal.h b/third_party/mojo/src/mojo/edk/embedder/embedder_internal.h |
index 752d366dd99d52db785c455107b5bc8064dd4a07..6f201b81e65d6430955fa3b02657cd4e58ad3cbe 100644 |
--- a/third_party/mojo/src/mojo/edk/embedder/embedder_internal.h |
+++ b/third_party/mojo/src/mojo/edk/embedder/embedder_internal.h |
@@ -11,7 +11,7 @@ |
#include <stdint.h> |
-#include "mojo/edk/embedder/process_type.h" |
+#include "mojo/edk/system/channel_id.h" |
namespace base { |
class TaskRunner; |
@@ -23,9 +23,7 @@ namespace system { |
class ChannelManager; |
class Core; |
- |
-// Duplicate from mojo/edk/system/channel_manager.h, to avoid including it. |
-using ChannelId = uint64_t; |
+class IPCSupport; |
} // namespace system |
@@ -52,11 +50,11 @@ extern PlatformSupport* g_platform_support; |
// Instance of |Core| used by the system functions (|Mojo...()|). |
extern system::Core* g_core; |
-// Type of process initialized in |InitIPCSupport()| (set to |UNINITIALIZED| if |
-// "outside" |InitIPCSupport()|/|ShutdownIPCSupport()|). This is declared here |
-// so that |mojo::embedder::test::Shutdown()| can check that it's only called |
-// after |ShutdownIPCSupport()|. |
-extern ProcessType g_process_type; |
+// Instance of |IPCSupport|, initialized by |InitIPCSupport()| and reset by |
+// |ShutdownIPCSupport()|. This is declared here so that |
+// |mojo::embedder::test::Shutdown()| can check that it's only called after |
+// |ShutdownIPCSupport()|. |
+extern system::IPCSupport* g_ipc_support; |
} // namespace internal |