commit c9a4b21cdc8f2dec925b4c981b892a2365fed626
author viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Mar 20 16:06:40 2014 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 16:18:04 2020 +0900
tree b2c862227046619b977226842997b81cbaa0a7e6
parent 6595441293e640a7e0b3808eed5799681652cdd6

Make the shmem-specific functions in file_util.h POSIX-only.

They're only used on POSIX. (This is an initial move/removal; more to
come.)

R=brettw@chromium.org

Review URL: https://codereview.chromium.org/204683002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258242 0039d316-1c4b-4281-b951-d872f2087c98


CrOS-Libchrome-Original-Commit: 6f5418ba7f128c0e1d0c89f8b647bb68400e9b22

base/file_util_posix.cc

diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index fb4ebcf..0879510 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -463,25 +463,6 @@
 }
 #endif  // !defined(OS_MACOSX)
 
-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
-// This is implemented in file_util_mac.mm and file_util_android.cc for those
-// platforms.
-bool GetShmemTempDir(bool executable, FilePath* path) {
-#if defined(OS_LINUX)
-  bool use_dev_shm = true;
-  if (executable) {
-    static const bool s_dev_shm_executable = DetermineDevShmExecutable();
-    use_dev_shm = s_dev_shm_executable;
-  }
-  if (use_dev_shm) {
-    *path = FilePath("/dev/shm");
-    return true;
-  }
-#endif
-  return GetTempDir(path);
-}
-#endif  // !defined(OS_MACOSX) && !defined(OS_ANDROID)
-
 #if !defined(OS_MACOSX)  // Mac implementation is in file_util_mac.mm.
 FilePath GetHomeDir() {
 #if defined(OS_CHROMEOS)
@@ -528,14 +509,6 @@
   return true;
 }
 
-FILE* CreateAndOpenTemporaryShmemFile(FilePath* path, bool executable) {
-  FilePath directory;
-  if (!GetShmemTempDir(executable, &directory))
-    return NULL;
-
-  return CreateAndOpenTemporaryFileInDir(directory, path);
-}
-
 FILE* CreateAndOpenTemporaryFileInDir(const FilePath& dir, FilePath* path) {
   int fd = CreateAndOpenFdForTemporaryFile(dir, path);
   if (fd < 0)
@@ -847,6 +820,33 @@
   return pathconf(path.value().c_str(), _PC_NAME_MAX);
 }
 
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+// This is implemented in file_util_mac.mm and file_util_android.cc for those
+// platforms.
+bool GetShmemTempDir(bool executable, FilePath* path) {
+#if defined(OS_LINUX)
+  bool use_dev_shm = true;
+  if (executable) {
+    static const bool s_dev_shm_executable = DetermineDevShmExecutable();
+    use_dev_shm = s_dev_shm_executable;
+  }
+  if (use_dev_shm) {
+    *path = FilePath("/dev/shm");
+    return true;
+  }
+#endif
+  return GetTempDir(path);
+}
+#endif  // !defined(OS_MACOSX) && !defined(OS_ANDROID)
+
+FILE* CreateAndOpenTemporaryShmemFile(FilePath* path, bool executable) {
+  FilePath directory;
+  if (!GetShmemTempDir(executable, &directory))
+    return NULL;
+
+  return CreateAndOpenTemporaryFileInDir(directory, path);
+}
+
 // -----------------------------------------------------------------------------
 
 namespace internal {