Move platform_handle_security_util_win to public mojo directory.

This file will shortly be needed by tests in //content so this CL exposes the file up to the mojo embedder. This CL contains no functional changes. BUG=1418101 Change-Id: Ie2741cae0c0537f4a7af0f73ec725477fa562b79 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4289771 Reviewed-by: Ken Rockot <rockot@google.com> Commit-Queue: Will Harris <wfh@chromium.org> Cr-Commit-Position: refs/heads/main@{#1110708}
Denger-Network · Feb 28, 2023 · 78f983d · 78f983d
1 parent 638c8f2
commit 78f983d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/mojo/core/BUILD.gn b/mojo/core/BUILD.gn
@@ -204,8 +204,6 @@ template("core_impl_source_set") {
       sources += [
         "broker_win.cc",
         "channel_win.cc",
-        "platform_handle_security_util_win.cc",
-        "platform_handle_security_util_win.h",
       ]
     }
 

diff --git a/mojo/core/ipcz_driver/transport.cc b/mojo/core/ipcz_driver/transport.cc
@@ -29,7 +29,7 @@
 #include "third_party/ipcz/include/ipcz/ipcz.h"
 
 #if BUILDFLAG(IS_WIN)
-#include "mojo/core/platform_handle_security_util_win.h"
+#include "mojo/public/cpp/platform/platform_handle_security_util_win.h"
 #endif
 
 namespace mojo::core::ipcz_driver {

diff --git a/mojo/core/platform_handle_in_transit.cc b/mojo/core/platform_handle_in_transit.cc
@@ -17,7 +17,7 @@
 
 #include "base/win/nt_status.h"
 #include "base/win/scoped_handle.h"
-#include "mojo/core/platform_handle_security_util_win.h"
+#include "mojo/public/cpp/platform/platform_handle_security_util_win.h"
 #endif
 
 namespace mojo {

diff --git a/mojo/public/cpp/platform/BUILD.gn b/mojo/public/cpp/platform/BUILD.gn
@@ -28,6 +28,11 @@ component("platform") {
     sources += [ "socket_utils_posix.cc" ]
   }
 
+  if (is_win) {
+    public += [ "platform_handle_security_util_win.h" ]
+    sources += [ "platform_handle_security_util_win.cc" ]
+  }
+
   public_deps = [
     "//base",
     "//mojo/public/c/system:headers",

diff --git a/...core/platform_handle_security_util_win.cc → ...form/platform_handle_security_util_win.cc b/...core/platform_handle_security_util_win.cc → ...form/platform_handle_security_util_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/core/platform_handle_security_util_win.h"
+#include "mojo/public/cpp/platform/platform_handle_security_util_win.h"
 
 #include <windows.h>
 #include <winternl.h>
@@ -18,7 +18,7 @@
 #include "base/win/scoped_handle.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
-namespace mojo::core {
+namespace mojo {
 
 namespace {
 
@@ -108,4 +108,4 @@ void DcheckIfFileHandleIsUnsafe(HANDLE handle) {
 #endif  // DCHECK_IS_ON();
 }
 
-}  // namespace mojo::core
+}  // namespace mojo
diff --git a/.../core/platform_handle_security_util_win.h → ...tform/platform_handle_security_util_win.h b/.../core/platform_handle_security_util_win.h → ...tform/platform_handle_security_util_win.h
@@ -2,18 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_CORE_PLATFORM_HANDLE_SECURITY_UTIL_WIN_H_
-#define MOJO_CORE_PLATFORM_HANDLE_SECURITY_UTIL_WIN_H_
+#ifndef MOJO_PUBLIC_CPP_PLATFORM_PLATFORM_HANDLE_SECURITY_UTIL_WIN_H_
+#define MOJO_PUBLIC_CPP_PLATFORM_PLATFORM_HANDLE_SECURITY_UTIL_WIN_H_
 
+#include "base/component_export.h"
 #include "base/win/windows_types.h"
 
-namespace mojo::core {
+namespace mojo {
 
 // This function DCHECKs if `handle` is to a writeable file that can be mapped
 // executable. If so, this is a security risk. Does nothing in non-DCHECK
 // builds.
+COMPONENT_EXPORT(MOJO_CPP_PLATFORM)
 void DcheckIfFileHandleIsUnsafe(HANDLE handle);
 
-}  // namespace mojo::core
+}  // namespace mojo
 
-#endif  // MOJO_CORE_PLATFORM_HANDLE_SECURITY_UTIL_WIN_H_
+#endif  // MOJO_PUBLIC_CPP_PLATFORM_PLATFORM_HANDLE_SECURITY_UTIL_WIN_H_