Add support for WEBKIT_USE_NEW_WEBFILESYSTEMTYPE

webkit/fileapi/file_system_util.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_FILEAPI_FILE_SYSTEM_UTIL_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_UTIL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/platform_file.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystemType.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/quota/quota_types.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 class GURL;
 
 namespace fileapi {
 
 class FileSystemURL;
@@ skipping 84 matching lines @@
     const std::string& origin_identifier);
 
 // Returns the string representation of the given filesystem |type|.
 // Returns an empty string if the |type| is invalid.
 WEBKIT_STORAGE_EXPORT std::string GetFileSystemTypeString(FileSystemType type);
 
 // Sets type to FileSystemType enum that corresponds to the string name.
 // Returns false if the |type_string| is invalid.
 WEBKIT_STORAGE_EXPORT bool GetFileSystemPublicType(
     std::string type_string,
-    WebKit::WebFileSystem::Type* type);
+#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
+    WebKit::WebFileSystemType* type
+#else
+    WebKit::WebFileSystem::Type* type
+#endif
+);
 
 // Encodes |file_path| to a string.
 // Following conditions should be held:
 //  - StringToFilePath(FilePathToString(path)) == path
 //  - StringToFilePath(FilePathToString(path) + "/" + "SubDirectory") ==
 //    path.AppendASCII("SubDirectory");
 //
 // TODO(tzik): Replace CreateFilePath and FilePathToString in
 // third_party/leveldatabase/env_chromium.cc with them.
 WEBKIT_STORAGE_EXPORT std::string FilePathToString(const base::FilePath& file_path);
@@ skipping 30 matching lines @@
 
 // Returns true if |url1| and |url2| belong to the same filesystem
 // (i.e. url1.origin() == url2.origin() && url1.type() == url2.type())
 WEBKIT_STORAGE_EXPORT bool AreSameFileSystem(
     const FileSystemURL& url1,
     const FileSystemURL& url2);
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_UTIL_H_