Use LockFile/UnlockFile for Settings to port to Windows

client/settings.h

Index: client/settings.h
diff --git a/client/settings.h b/client/settings.h
index bab5186a5351374f5c0449a54c6cd61605b56d95..7b96fd323e92ddd755a1321979d7325bef431278 100644
--- a/client/settings.h
+++ b/client/settings.h
@@ -21,12 +21,23 @@
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
+#include "base/move.h"

[Robert Sesek, 2015/04/17 21:33:36]

Needed?

[scottmg, 2015/04/20 18:20:41]

Done.

+#include "base/scoped_generic.h"
 #include "util/file/file_io.h"
 #include "util/misc/initialization_state_dcheck.h"
 #include "util/misc/uuid.h"
 
 namespace crashpad {
 
+namespace internal {
+
+struct ScopedLockedFileHandleTraits {
+  static FileHandle InvalidValue();
+  static void Free(FileHandle handle);
+};
+
+}  // namespace internal
+
 //! \brief An interface for accessing and modifying the settings of a
 //!     CrashReportDatabase.
 //!
@@ -95,13 +106,21 @@ class Settings {
  private:
   struct Data;
 
+  // This must be constructed with MakeScopedLockedFileHandle(). It both unlocks
+  // and closes the file on destruction.
+  using ScopedLockedFileHandle =
+      base::ScopedGeneric<FileHandle,
+                          internal::ScopedLockedFileHandleTraits>;
+  static ScopedLockedFileHandle MakeScopedLockedFileHandle(FileHandle file,
+                                                           FileLocking locking);
+
   // Opens the settings file for reading. On error, logs a message and returns
   // the invalid handle.
-  ScopedFileHandle OpenForReading();
+  ScopedLockedFileHandle OpenForReading();
 
   // Opens the settings file for reading and writing. On error, logs a message
   // and returns the invalid handle.
-  ScopedFileHandle OpenForReadingAndWriting();
+  ScopedLockedFileHandle OpenForReadingAndWriting();
 
   // Opens the settings file and reads the data. If that fails, an error will
   // be logged and the settings will be recovered and re-initialized. If that
@@ -111,7 +130,7 @@ class Settings {
   // Opens the settings file for writing and reads the data. If reading fails,
   // recovery is attempted. Returns the opened file handle on success, or the
   // invalid file handle on failure, with an error logged.
-  ScopedFileHandle OpenForWritingAndReadSettings(Data* out_data);
+  ScopedLockedFileHandle OpenForWritingAndReadSettings(Data* out_data);
 
   // Reads the settings from |handle|. Logs an error and returns false on
   // failure. This does not perform recovery.