Add support for WEBKIT_USE_NEW_WEBFILESYSTEMTYPE

webkit/fileapi/file_system_util.cc

Index: webkit/fileapi/file_system_util.cc
===================================================================
--- webkit/fileapi/file_system_util.cc	(revision 188767)
+++ webkit/fileapi/file_system_util.cc	(working copy)
@@ -291,22 +291,43 @@
 
 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();