Revert of Mandoline filesystem: Enable windows build.

components/filesystem/util.cc

Index: components/filesystem/util.cc
diff --git a/components/filesystem/util.cc b/components/filesystem/util.cc
index 257d0083dd8502b287d2982b381e7aa19b5dc371..e268bc4e057421b584d62a4269df6cbed1efef9c 100644
--- a/components/filesystem/util.cc
+++ b/components/filesystem/util.cc
@@ -14,10 +14,6 @@
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "mojo/public/cpp/bindings/string.h"
-
-#if defined(OS_WIN)
-#include "base/strings/utf_string_conversions.h"
-#endif
 
 // module filesystem has various constants which must line up with enum values
 // in base::File::Flags.
@@ -47,55 +43,55 @@
               "");
 
 // filesystem.Error in types.mojom must be the same as base::File::Error.
-static_assert(static_cast<int>(filesystem::FILE_ERROR_OK) ==
+static_assert(static_cast<int>(filesystem::ERROR_OK) ==
                   static_cast<int>(base::File::FILE_OK),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_FAILED) ==
+static_assert(static_cast<int>(filesystem::ERROR_FAILED) ==
                   static_cast<int>(base::File::FILE_ERROR_FAILED),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_IN_USE) ==
+static_assert(static_cast<int>(filesystem::ERROR_IN_USE) ==
                   static_cast<int>(base::File::FILE_ERROR_IN_USE),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_EXISTS) ==
+static_assert(static_cast<int>(filesystem::ERROR_EXISTS) ==
                   static_cast<int>(base::File::FILE_ERROR_EXISTS),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_NOT_FOUND) ==
+static_assert(static_cast<int>(filesystem::ERROR_NOT_FOUND) ==
                   static_cast<int>(base::File::FILE_ERROR_NOT_FOUND),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_ACCESS_DENIED) ==
+static_assert(static_cast<int>(filesystem::ERROR_ACCESS_DENIED) ==
                   static_cast<int>(base::File::FILE_ERROR_ACCESS_DENIED),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_TOO_MANY_OPENED) ==
+static_assert(static_cast<int>(filesystem::ERROR_TOO_MANY_OPENED) ==
                   static_cast<int>(base::File::FILE_ERROR_TOO_MANY_OPENED),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_NO_MEMORY) ==
+static_assert(static_cast<int>(filesystem::ERROR_NO_MEMORY) ==
                   static_cast<int>(base::File::FILE_ERROR_NO_MEMORY),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_NO_SPACE) ==
+static_assert(static_cast<int>(filesystem::ERROR_NO_SPACE) ==
                   static_cast<int>(base::File::FILE_ERROR_NO_SPACE),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_NOT_A_DIRECTORY) ==
+static_assert(static_cast<int>(filesystem::ERROR_NOT_A_DIRECTORY) ==
                   static_cast<int>(base::File::FILE_ERROR_NOT_A_DIRECTORY),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_INVALID_OPERATION) ==
+static_assert(static_cast<int>(filesystem::ERROR_INVALID_OPERATION) ==
                   static_cast<int>(base::File::FILE_ERROR_INVALID_OPERATION),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_SECURITY) ==
+static_assert(static_cast<int>(filesystem::ERROR_SECURITY) ==
                   static_cast<int>(base::File::FILE_ERROR_SECURITY),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_ABORT) ==
+static_assert(static_cast<int>(filesystem::ERROR_ABORT) ==
                   static_cast<int>(base::File::FILE_ERROR_ABORT),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_NOT_A_FILE) ==
+static_assert(static_cast<int>(filesystem::ERROR_NOT_A_FILE) ==
                   static_cast<int>(base::File::FILE_ERROR_NOT_A_FILE),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_NOT_EMPTY) ==
+static_assert(static_cast<int>(filesystem::ERROR_NOT_EMPTY) ==
                   static_cast<int>(base::File::FILE_ERROR_NOT_EMPTY),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_INVALID_URL) ==
+static_assert(static_cast<int>(filesystem::ERROR_INVALID_URL) ==
                   static_cast<int>(base::File::FILE_ERROR_INVALID_URL),
               "");
-static_assert(static_cast<int>(filesystem::FILE_ERROR_IO) ==
+static_assert(static_cast<int>(filesystem::ERROR_IO) ==
                   static_cast<int>(base::File::FILE_ERROR_IO),
               "");
 
@@ -112,28 +108,28 @@
 
 namespace filesystem {
 
-FileError IsWhenceValid(Whence whence) {
+Error IsWhenceValid(Whence whence) {
   return (whence == WHENCE_FROM_CURRENT || whence == WHENCE_FROM_BEGIN ||
           whence == WHENCE_FROM_END)
-             ? FILE_ERROR_OK
-             : FILE_ERROR_INVALID_OPERATION;
+             ? ERROR_OK
+             : ERROR_INVALID_OPERATION;
 }
 
-FileError IsOffsetValid(int64_t offset) {
+Error IsOffsetValid(int64_t offset) {
   return (offset >= std::numeric_limits<off_t>::min() &&
           offset <= std::numeric_limits<off_t>::max())
-             ? FILE_ERROR_OK
-             : FILE_ERROR_INVALID_OPERATION;
+             ? ERROR_OK
+             : ERROR_INVALID_OPERATION;
 }
 
-FileError GetError(const base::File& file) {
-  return static_cast<filesystem::FileError>(file.error_details());
+Error GetError(const base::File& file) {
+  return static_cast<filesystem::Error>(file.error_details());
 }
 
 FileInformationPtr MakeFileInformation(const base::File::Info& info) {
   FileInformationPtr file_info(FileInformation::New());
   file_info->type =
-      info.is_directory ? FS_FILE_TYPE_DIRECTORY : FS_FILE_TYPE_REGULAR_FILE;
+      info.is_directory ? FILE_TYPE_DIRECTORY : FILE_TYPE_REGULAR_FILE;
   file_info->size = info.size;
 
   file_info->atime = info.last_accessed.ToDoubleT();
@@ -143,31 +139,25 @@
   return file_info.Pass();
 }
 
-FileError ValidatePath(const mojo::String& raw_path,
-                       const base::FilePath& filesystem_base,
-                       base::FilePath* out) {
+Error ValidatePath(const mojo::String& raw_path,
+                   const base::FilePath& filesystem_base,
+                   base::FilePath* out) {
   DCHECK(!raw_path.is_null());
   if (!base::IsStringUTF8(raw_path.get()))
-    return FILE_ERROR_INVALID_OPERATION;
-
-#if defined(OS_POSIX)
-  base::FilePath::StringType path = raw_path;
-#elif defined(OS_WIN)
-  base::FilePath::StringType path = base::UTF8ToUTF16(raw_path.get());
-#endif
+    return ERROR_INVALID_OPERATION;
 
   // TODO(erg): This isn't really what we want. FilePath::AppendRelativePath()
   // is closer. We need to deal with entirely hostile apps trying to bust this
   // function to use a possibly maliciously provided |raw_path| to bust out of
   // |filesystem_base|.
-  base::FilePath full_path = filesystem_base.Append(path);
+  base::FilePath full_path = filesystem_base.Append(raw_path);
   if (full_path.ReferencesParent()) {
     // TODO(erg): For now, if it references a parent, we'll consider this bad.
-    return FILE_ERROR_ACCESS_DENIED;
+    return ERROR_ACCESS_DENIED;
   }
 
   *out = full_path;
-  return FILE_ERROR_OK;
+  return ERROR_OK;
 }
 
 }  // namespace filesystem