Remove nonsfi code in base/

Bug: 1273132
Change-Id: Ic0abfb7e3553d14532f997a75dc5d83acf0f21b4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3324642
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/main@{#949824}

base/files/file_util.cc

@@ -31,7 +31,6 @@
 
 namespace base {
 
-#if !defined(OS_NACL_NONSFI)
 #if !defined(OS_WIN)
 OnceCallback<void(const FilePath&)> GetDeleteFileCallback() {
   return BindOnce(IgnoreResult(&DeleteFile));
@@ -179,7 +178,6 @@ bool TextContentsEqual(const FilePath& filename1, const FilePath& filename2) {
 
   return true;
 }
-#endif  // !defined(OS_NACL_NONSFI)
 
 bool ReadStreamToString(FILE* stream, std::string* contents) {
   return ReadStreamToStringWithMaxSize(
@@ -202,7 +200,6 @@ bool ReadStreamToStringWithMaxSize(FILE* stream,
   // chunk size if available.
   constexpr int64_t kDefaultChunkSize = 1 << 16;
   int64_t chunk_size = kDefaultChunkSize - 1;
-#if !defined(OS_NACL_NONSFI)
   ScopedBlockingCall scoped_blocking_call(FROM_HERE, BlockingType::MAY_BLOCK);
 #if defined(OS_WIN)
   BY_HANDLE_FILE_INFORMATION file_info = {};
@@ -229,9 +226,6 @@ bool ReadStreamToStringWithMaxSize(FILE* stream,
   // We need to attempt to read at EOF for feof flag to be set so here we
   // use |chunk_size| + 1.
   chunk_size = std::min<uint64_t>(chunk_size, max_size) + 1;
-#else   // !defined(OS_NACL_NONSFI)
-  chunk_size = kDefaultChunkSize;
-#endif  // !defined(OS_NACL_NONSFI)
   size_t bytes_read_this_pass;
   size_t bytes_read_so_far = 0;
   bool read_status = true;
@@ -285,7 +279,6 @@ bool ReadFileToStringWithMaxSize(const FilePath& path,
   return ReadStreamToStringWithMaxSize(file_stream.get(), max_size, contents);
 }
 
-#if !defined(OS_NACL_NONSFI)
 bool IsDirectoryEmpty(const FilePath& dir_path) {
   FileEnumerator files(dir_path, false,
       FileEnumerator::FILES | FileEnumerator::DIRECTORIES);
@@ -340,15 +333,13 @@ bool TouchFile(const FilePath& path,
 
   return file.SetTimes(last_accessed, last_modified);
 }
-#endif  // !defined(OS_NACL_NONSFI)
 
 bool CloseFile(FILE* file) {
   if (file == nullptr)
     return true;
   return fclose(file) == 0;
 }
 
-#if !defined(OS_NACL_NONSFI)
 bool TruncateFile(FILE* file) {
   if (file == nullptr)
     return false;
@@ -440,6 +431,4 @@ bool PreReadFileSlow(const FilePath& file_path, int64_t max_bytes) {
 
 }  // namespace internal
 
-#endif  // !defined(OS_NACL_NONSFI)
-
 }  // namespace base

base/files/file_util_posix.cc

@@ -76,7 +76,6 @@ namespace base {
 
 namespace {
 
-#if !defined(OS_NACL_NONSFI)
 // Helper for VerifyPathControlledByUser.
 bool VerifySpecificPathControlledByUser(const FilePath& path,
                                         uid_t owner_uid,
@@ -314,7 +313,6 @@ bool DoDeleteFile(const FilePath& path, bool recursive) {
   }
   return success;
 }
-#endif  // !defined(OS_NACL_NONSFI)
 
 #if !defined(OS_APPLE)
 // Appends |mode_char| to |mode| before the optional character set encoding; see
@@ -331,7 +329,6 @@ std::string AppendModeCharacter(StringPiece mode, char mode_char) {
 
 }  // namespace
 
-#if !defined(OS_NACL_NONSFI)
 FilePath MakeAbsoluteFilePath(const FilePath& input) {
   ScopedBlockingCall scoped_blocking_call(FROM_HERE, BlockingType::MAY_BLOCK);
   char full_path[PATH_MAX];
@@ -370,7 +367,6 @@ bool CopyDirectoryExcl(const FilePath& from_path,
                        bool recursive) {
   return DoCopyDirectory(from_path, to_path, recursive, true);
 }
-#endif  // !defined(OS_NACL_NONSFI)
 
 bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, bool non_blocking) {
   int fds[2];
@@ -418,15 +414,11 @@ bool SetNonBlocking(int fd) {
 }
 
 bool SetCloseOnExec(int fd) {
-#if defined(OS_NACL_NONSFI)
-  const int flags = 0;
-#else
   const int flags = fcntl(fd, F_GETFD);
   if (flags == -1)
     return false;
   if (flags & FD_CLOEXEC)
     return true;
-#endif  // defined(OS_NACL_NONSFI)
   if (HANDLE_EINTR(fcntl(fd, F_SETFD, flags | FD_CLOEXEC)) == -1)
     return false;
   return true;
@@ -442,19 +434,15 @@ bool PathExists(const FilePath& path) {
   return access(path.value().c_str(), F_OK) == 0;
 }
 
-#if !defined(OS_NACL_NONSFI)
 bool PathIsReadable(const FilePath& path) {
   ScopedBlockingCall scoped_blocking_call(FROM_HERE, BlockingType::MAY_BLOCK);
   return access(path.value().c_str(), R_OK) == 0;
 }
-#endif  // !defined(OS_NACL_NONSFI)
 
-#if !defined(OS_NACL_NONSFI)
 bool PathIsWritable(const FilePath& path) {
   ScopedBlockingCall scoped_blocking_call(FROM_HERE, BlockingType::MAY_BLOCK);
   return access(path.value().c_str(), W_OK) == 0;
 }
-#endif  // !defined(OS_NACL_NONSFI)
 
 bool DirectoryExists(const FilePath& path) {
   ScopedBlockingCall scoped_blocking_call(FROM_HERE, BlockingType::MAY_BLOCK);
@@ -476,8 +464,6 @@ bool ReadFromFD(int fd, char* buffer, size_t bytes) {
   return total_read == bytes;
 }
 
-#if !defined(OS_NACL_NONSFI)
-
 ScopedFD CreateAndOpenFdForTemporaryFileInDir(const FilePath& directory,
                                               FilePath* path) {
   ScopedBlockingCall scoped_blocking_call(
@@ -814,7 +800,6 @@ bool GetFileInfo(const FilePath& file_path, File::Info* results) {
   results->FromStat(file_info);
   return true;
 }
-#endif  // !defined(OS_NACL_NONSFI)
 
 FILE* OpenFile(const FilePath& filename, const char* mode) {
   // 'e' is unconditionally added below, so be sure there is not one already
@@ -983,8 +968,6 @@ bool AllocateFileRegion(File* file, int64_t offset, size_t size) {
   return true;
 }
 
-#if !defined(OS_NACL_NONSFI)
-
 bool AppendToFile(const FilePath& filename, span<const uint8_t> data) {
   ScopedBlockingCall scoped_blocking_call(FROM_HERE, BlockingType::MAY_BLOCK);
   bool ret = true;
@@ -1290,8 +1273,6 @@ bool CopyFileContentsWithSendfile(File& infile,
 
 }  // namespace internal
 
-#endif  // !defined(OS_NACL_NONSFI)
-
 #if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX)
 BASE_EXPORT bool IsPathExecutable(const FilePath& path) {
   bool result = false;

base/files/file_util_unittest.cc

@@ -4093,7 +4093,6 @@ TEST_F(FileUtilTest, NonExistentContentUriTest) {
 }
 #endif
 
-#if !defined(OS_NACL_NONSFI)
 TEST_F(FileUtilTest, GetUniquePathNumberNoFile) {
   // This file does not exist.
   const FilePath some_file = temp_dir_.GetPath().Append(FPL("SomeFile.txt"));
@@ -4206,8 +4205,6 @@ TEST_F(FileUtilTest, PreReadFile_InexistentFile) {
       PreReadFile(inexistent_file, /*is_executable=*/false).succeeded());
 }
 
-#endif  // !defined(OS_NACL_NONSFI)
-
 // Test that temp files obtained racily are all unique (no interference between
 // threads). Mimics file operations in DoLaunchChildTestProcess() to rule out
 // thread-safety issues @ https://crbug.com/826408#c17.

base/posix/unix_domain_socket.cc

@@ -6,9 +6,8 @@
 
 #include <errno.h>
 #include <sys/socket.h>
-#if !defined(OS_NACL_NONSFI)
+#include <sys/uio.h>
 #include <sys/un.h>
-#endif
 #include <unistd.h>
 
 #include <vector>
@@ -20,15 +19,10 @@
 #include "base/posix/eintr_wrapper.h"
 #include "build/build_config.h"
 
-#if !defined(OS_NACL_NONSFI)
-#include <sys/uio.h>
-#endif
-
 namespace base {
 
 const size_t UnixDomainSocket::kMaxFileDescriptors = 16;
 
-#if !defined(OS_NACL_NONSFI)
 bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
   int raw_socks[2];
 #if defined(OS_APPLE)
@@ -64,7 +58,6 @@ bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
   return true;
 #endif  // OS_APPLE
 }
-#endif  // !defined(OS_NACL_NONSFI)
 
 // static
 bool UnixDomainSocket::SendMsg(int fd,
@@ -147,11 +140,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
 
   const size_t kControlBufferSize =
       CMSG_SPACE(sizeof(int) * kMaxFileDescriptors)
-#if !defined(OS_NACL_NONSFI) && !defined(OS_APPLE)
-      // The PNaCl toolchain for Non-SFI binary build and macOS do not support
-      // ucred. macOS supports xucred, but this structure is insufficient.
+#if !defined(OS_APPLE)
+      // macOS does not support ucred.
+      // macOS supports xucred, but this structure is insufficient.
       + CMSG_SPACE(sizeof(struct ucred))
-#endif  // !defined(OS_NACL_NONSFI) && !defined(OS_APPLE)
+#endif  // !defined(OS_APPLE)
       ;
   char control_buffer[kControlBufferSize];
   msg.msg_control = control_buffer;
@@ -175,16 +168,15 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
         wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg));
         wire_fds_len = payload_len / sizeof(int);
       }
-#if !defined(OS_NACL_NONSFI) && !defined(OS_APPLE)
-      // The PNaCl toolchain for Non-SFI binary build and macOS do not support
-      // SCM_CREDENTIALS.
+#if !defined(OS_APPLE)
+      // macOS does not support SCM_CREDENTIALS.
       if (cmsg->cmsg_level == SOL_SOCKET &&
           cmsg->cmsg_type == SCM_CREDENTIALS) {
         DCHECK_EQ(payload_len, sizeof(struct ucred));
         DCHECK_EQ(pid, -1);
         pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid;
       }
-#endif  // !defined(OS_NACL_NONSFI) && !defined(OS_APPLE)
+#endif  // !defined(OS_APPLE)
     }
   }
 
@@ -225,7 +217,6 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
   return r;
 }
 
-#if !defined(OS_NACL_NONSFI)
 // static
 ssize_t UnixDomainSocket::SendRecvMsg(int fd,
                                       uint8_t* reply,
@@ -283,6 +274,5 @@ ssize_t UnixDomainSocket::SendRecvMsgWithFlags(int fd,
 
   return reply_len;
 }
-#endif  // !defined(OS_NACL_NONSFI)
 
 }  // namespace base

base/posix/unix_domain_socket.h

@@ -19,24 +19,20 @@ namespace base {
 
 class Pickle;
 
-#if !defined(OS_NACL_NONSFI)
 // Creates a connected pair of UNIX-domain SOCK_SEQPACKET sockets, and passes
 // ownership of the newly allocated file descriptors to |one| and |two|.
 // Returns true on success.
 bool BASE_EXPORT CreateSocketPair(ScopedFD* one, ScopedFD* two);
-#endif
 
 class BASE_EXPORT UnixDomainSocket {
  public:
   // Maximum number of file descriptors that can be read by RecvMsg().
   static const size_t kMaxFileDescriptors;
 
-#if !defined(OS_NACL_NONSFI)
   // Use to enable receiving process IDs in RecvMsgWithPid.  Should be called on
   // the receiving socket (i.e., the socket passed to RecvMsgWithPid). Returns
   // true if successful.
   static bool EnableReceiveProcessId(int fd);
-#endif  // !defined(OS_NACL_NONSFI)
 
   // Use sendmsg to write the given msg and include a vector of file
   // descriptors. Returns true if successful.
@@ -62,7 +58,6 @@ class BASE_EXPORT UnixDomainSocket {
                                 std::vector<ScopedFD>* fds,
                                 ProcessId* pid);
 
-#if !defined(OS_NACL_NONSFI)
   // Perform a sendmsg/recvmsg pair.
   //   1. This process creates a UNIX SEQPACKET socketpair. Using
   //      connection-oriented sockets (SEQPACKET or STREAM) is critical here,
@@ -95,7 +90,6 @@ class BASE_EXPORT UnixDomainSocket {
                                       int recvmsg_flags,
                                       int* result_fd,
                                       const Pickle& request);
-#endif  // !defined(OS_NACL_NONSFI)
 
  private:
   // Similar to RecvMsg, but allows to specify |flags| for recvmsg(2).

base/process/kill_posix.cc

@@ -90,7 +90,6 @@ TerminationStatus GetKnownDeadTerminationStatus(ProcessHandle handle,
   return GetTerminationStatusImpl(handle, true /* can_block */, exit_code);
 }
 
-#if !defined(OS_NACL_NONSFI)
 bool WaitForProcessesToExit(const FilePath::StringType& executable_name,
                             TimeDelta wait,
                             const ProcessFilter* filter) {
@@ -174,6 +173,5 @@ void EnsureProcessGetsReaped(Process process) {
 #endif  // defined(OS_LINUX) || defined(OS_CHROMEOS)
 
 #endif  // !defined(OS_APPLE)
-#endif  // !defined(OS_NACL_NONSFI)
 
 }  // namespace base

base/process/launch.h

@@ -417,7 +417,7 @@ BASE_EXPORT void RaiseProcessToHighPriority();
 // binary. This should not be called in production/released code.
 BASE_EXPORT LaunchOptions LaunchOptionsForTest();
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_NACL_NONSFI)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS)
 // A wrapper for clone with fork-like behavior, meaning that it returns the
 // child's pid in the parent and 0 in the child. |flags|, |ptid|, and |ctid| are
 // as in the clone system call (the CLONE_VM flag is not supported).

base/process/launch_posix.cc

@@ -68,8 +68,6 @@ extern char** environ;
 
 namespace base {
 
-#if !defined(OS_NACL_NONSFI)
-
 namespace {
 
 // Get the process's "environment" (i.e. the thing that setenv/getenv
@@ -672,10 +670,7 @@ bool GetAppOutputWithExitCode(const CommandLine& cl,
                               exit_code);
 }
 
-#endif  // !defined(OS_NACL_NONSFI)
-
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_NACL_NONSFI) || \
-    defined(OS_AIX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX)
 namespace {
 
 // This function runs on the stack specified on the clone call. It uses longjmp
@@ -750,6 +745,6 @@ pid_t ForkWithFlags(unsigned long flags, pid_t* ptid, pid_t* ctid) {
 
   return 0;
 }
-#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_NACL_NONSFI)
+#endif  // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX)
 
 }  // namespace base

base/process/process_posix.cc

@@ -33,8 +33,6 @@
 
 namespace {
 
-#if !defined(OS_NACL_NONSFI)
-
 bool WaitpidWithTimeout(base::ProcessHandle handle,
                         int* status,
                         base::TimeDelta wait) {
@@ -226,7 +224,6 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle handle,
   }
   return exited;
 }
-#endif  // !defined(OS_NACL_NONSFI)
 
 }  // namespace
 
@@ -310,7 +307,6 @@ void Process::Close() {
   // end up w/ a zombie when it does finally exit.
 }
 
-#if !defined(OS_NACL_NONSFI)
 bool Process::Terminate(int exit_code, bool wait) const {
   // exit_code isn't supportable.
   DCHECK(IsValid());
@@ -331,7 +327,6 @@ bool Process::Terminate(int exit_code, bool wait) const {
 
   return did_terminate;
 }
-#endif  // !defined(OS_NACL_NONSFI)
 
 bool Process::WaitForExit(int* exit_code) const {
   return WaitForExitWithTimeout(TimeDelta::Max(), exit_code);