Switch [String]FileWriter to use new file_io.h functions/types

util/file/file_io.h

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #ifndef CRASHPAD_UTIL_FILE_FILE_IO_H_
 #define CRASHPAD_UTIL_FILE_FILE_IO_H_
 
 #include <sys/types.h>
 
 #include "build/build_config.h"
 
-#if defined(OS_WIN)
+#if defined(OS_POSIX)
+#include "base/files/scoped_file.h"
+#elif defined(OS_WIN)
 #include <windows.h>
+#include "util/win/scoped_handle.h"
 #endif
 
 namespace base {
 class FilePath;
 }  // namespace base
 
 namespace crashpad {
 
 #if defined(OS_POSIX) || DOXYGEN
 
 //! \brief Platform-specific alias for a low-level file handle.
 using FileHandle = int;
 
 //! \brief Platform-specific alias for a position in an open file.
 using FileOffset = off_t;
 
+//! \brief Scoped wrapper of a FileHandle.
+using ScopedFileHandle = base::ScopedFD;

[Mark Mentovai, 2014/12/19 20:42:57]

Good thing this name is available. :)

[scottmg, 2014/12/19 21:32:41]

You can see the future! :)

+
 #elif defined(OS_WIN)
 
 using FileHandle = HANDLE;
 using FileOffset = LONGLONG;
+using ScopedFileHandle = ScopedFileHANDLE;
 
 #endif
 
 //! \brief Determines the mode that LoggingOpenFileForWrite() uses.
 enum class FileWriteMode {
   //! \brief Opens the file if it exists, or creates a new file.
   kReuseOrCreate,
 
   //! \brief Creates a new file. If the file already exists, it will be
   //!     overwritten.
@@ skipping 91 matching lines @@
 //!
 //! \sa CheckedReadFile
 //! \sa ReadFile
 void CheckedReadFileAtEOF(FileHandle file);
 
 //! \brief Wraps `open()` or `CreateFile()`, opening an existing file for
 //!     reading. Logs an error if the operation fails.
 //!
 //! \return The newly opened FileHandle, or an invalid FileHandle on failure.
 //!
 //! \sa ScopedFD

[Mark Mentovai, 2014/12/19 20:42:57]

These two \sa can become one now, same for the open-for-write function.

[scottmg, 2014/12/19 21:32:41]

Done.

 //! \sa ScopedFileHANDLE
 FileHandle LoggingOpenFileForRead(const base::FilePath& path);
 
 //! \brief Wraps `open()` or `CreateFile()`, creating a file for output. Logs
 //!     an error if the operation fails.
 //!
 //! \a write_mode determines the style (truncate, reuse, etc.) that is used to
 //! open the file. On POSIX, if \a world_readable, `0644` will be used as
 //! `mode` permissions bits for `open()`, otherwise `0600` will be used. On
 //! Windows, the file is always opened in binary mode (that is, no CRLF
@@ skipping 28 matching lines @@
 
 //! \brief Wraps `close()` or `CloseHandle()`, ensuring that it succeeds.
 //!
 //! If the underlying function fails, this function causes execution to
 //! terminate without returning.
 void CheckedCloseFile(FileHandle file);
 
 }  // namespace crashpad
 
 #endif  // CRASHPAD_UTIL_FILE_FILE_IO_H_