| Index: base/files/file.h
|
| diff --git a/base/files/file.h b/base/files/file.h
|
| index b21b15972bce7c62be0dad659cff4e76af262ac2..1984667d23ee225c6c4c9158d72370d4e3e101b7 100644
|
| --- a/base/files/file.h
|
| +++ b/base/files/file.h
|
| @@ -6,9 +6,6 @@
|
| #define BASE_FILES_FILE_H_
|
|
|
| #include "build/build_config.h"
|
| -#if defined(OS_WIN)
|
| -#include <windows.h>
|
| -#endif
|
|
|
| #if defined(OS_POSIX)
|
| #include <sys/stat.h>
|
| @@ -25,17 +22,11 @@
|
| #include "base/move.h"
|
| #include "base/time/time.h"
|
|
|
| -#if defined(OS_WIN)
|
| -#include "base/win/scoped_handle.h"
|
| -#endif
|
| -
|
| FORWARD_DECLARE_TEST(FileTest, MemoryCorruption);
|
|
|
| namespace base {
|
|
|
| -#if defined(OS_WIN)
|
| -typedef HANDLE PlatformFile;
|
| -#elif defined(OS_POSIX)
|
| +#if defined(OS_POSIX)
|
| typedef int PlatformFile;
|
|
|
| #if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL)
|
| @@ -293,11 +284,7 @@ class BASE_EXPORT File {
|
|
|
| bool async() const { return async_; }
|
|
|
| -#if defined(OS_WIN)
|
| - static Error OSErrorToFileError(DWORD last_error);
|
| -#elif defined(OS_POSIX)
|
| static Error OSErrorToFileError(int saved_errno);
|
| -#endif
|
|
|
| // Converts an error value to a human-readable form. Used for logging.
|
| static std::string ErrorToString(Error error);
|
| @@ -362,11 +349,7 @@ class BASE_EXPORT File {
|
|
|
| void SetPlatformFile(PlatformFile file);
|
|
|
| -#if defined(OS_WIN)
|
| - win::ScopedHandle file_;
|
| -#elif defined(OS_POSIX)
|
| MemoryCheckingScopedFD file_;
|
| -#endif
|
|
|
| // Path that |Initialize()| was called with. Only set if safe (i.e. no '..').
|
| FilePath path_;
|
|
|