commit 58e1907f053a429373d7a781ce4fbe6357d0ba99
author hidehiko <hidehiko@chromium.org> Thu Nov 06 08:51:52 2014 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 17:54:04 2020 +0900
tree 451ece00ea60b27e1afdb1d2a1acc5f441064386
parent 0d654917c0bab98f088ec395337697354c5790c1

Non-SFI mode: Clean up macros of base/ and ipc/ libraries for nacl_helper_nonsfi.

Now, OS_NACL_SFI and OS_NACL_NONSFI are introduced to build/build_config.h, and these are preferred to __native_client_nonsfi__ and OS_NACL combination.

BUG=358465
TEST=Ran trybots.

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

Cr-Commit-Position: refs/heads/master@{#302907}


CrOS-Libchrome-Original-Commit: 853d6084e2f55a046ca7e3cc0ec427a26587f938

base/files/file_util_posix.cc

diff --git a/base/files/file_util_posix.cc b/base/files/file_util_posix.cc
index d86d9bc..b8c0eeb 100644
--- a/base/files/file_util_posix.cc
+++ b/base/files/file_util_posix.cc
@@ -59,7 +59,7 @@
 
 namespace base {
 
-#if !defined(__native_client_nonsfi__)
+#if !defined(OS_NACL_NONSFI)
 namespace {
 
 #if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL)
@@ -348,7 +348,7 @@
 
   return success;
 }
-#endif  // !defined(__native_client_nonsfi__)
+#endif  // !defined(OS_NACL_NONSFI)
 
 bool PathExists(const FilePath& path) {
   ThreadRestrictions::AssertIOAllowed();
@@ -360,7 +360,7 @@
   return access(path.value().c_str(), F_OK) == 0;
 }
 
-#if !defined(__native_client_nonsfi__)
+#if !defined(OS_NACL_NONSFI)
 bool PathIsWritable(const FilePath& path) {
   ThreadRestrictions::AssertIOAllowed();
   return access(path.value().c_str(), W_OK) == 0;
@@ -373,7 +373,7 @@
     return S_ISDIR(file_info.st_mode);
   return false;
 }
-#endif  // !defined(__native_client_nonsfi__)
+#endif  // !defined(OS_NACL_NONSFI)
 
 bool ReadFromFD(int fd, char* buffer, size_t bytes) {
   size_t total_read = 0;
@@ -387,7 +387,7 @@
   return total_read == bytes;
 }
 
-#if !defined(__native_client_nonsfi__)
+#if !defined(OS_NACL_NONSFI)
 bool CreateSymbolicLink(const FilePath& target_path,
                         const FilePath& symlink_path) {
   DCHECK(!symlink_path.empty());
@@ -928,5 +928,5 @@
 
 }  // namespace internal
 
-#endif  // !defined(__native_client_nonsfi__)
+#endif  // !defined(OS_NACL_NONSFI)
 }  // namespace base