Add support for WEBKIT_USE_NEW_WEBFILESYSTEMTYPE

webkit/fileapi/file_system_util.cc

 // 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.
 
 #include "webkit/fileapi/file_system_util.h"
 
 #include "build/build_config.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 273 matching lines @@
       return WebKit::WebFileErrorSecurity;
     case base::PLATFORM_FILE_ERROR_NO_SPACE:
       return WebKit::WebFileErrorQuotaExceeded;
     default:
       return WebKit::WebFileErrorInvalidModification;
   }
 }
 
 bool GetFileSystemPublicType(
     const std::string type_string,
-    WebKit::WebFileSystem::Type* type) {
+#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
+    WebKit::WebFileSystemType* type
+#else
+    WebKit::WebFileSystem::Type* type
+#endif
+) {
   DCHECK(type);
   if (type_string == "Temporary") {
+#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
+    *type = WebKit::WebFileSystemTypeTemporary;
+#else
     *type = WebKit::WebFileSystem::TypeTemporary;
+#endif
     return true;
   }
   if (type_string == "Persistent") {
+#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
+    *type = WebKit::WebFileSystemTypePersistent;
+#else
     *type = WebKit::WebFileSystem::TypePersistent;
+#endif
     return true;
   }
   if (type_string == "Isolated") {
+#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
+    *type = WebKit::WebFileSystemTypeIsolated;
+#else
     *type = WebKit::WebFileSystem::TypeIsolated;
+#endif
     return true;
   }
   if (type_string == "External") {
+#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
+    *type = WebKit::WebFileSystemTypeExternal;
+#else
     *type = WebKit::WebFileSystem::TypeExternal;
+#endif
     return true;
   }
   NOTREACHED();
   return false;
 }
 
 std::string GetIsolatedFileSystemName(const GURL& origin_url,
                                       const std::string& filesystem_id) {
   std::string name(fileapi::GetFileSystemName(origin_url,
       fileapi::kFileSystemTypeIsolated));
@@ skipping 44 matching lines @@
     root.append("/");
   }
   return root;
 }
 
 bool AreSameFileSystem(const FileSystemURL& url1, const FileSystemURL& url2) {
   return url1.origin() == url2.origin() && url1.type() == url2.type();
 }
 
 }  // namespace fileapi