Use WebKit API's filesystem types directly under webkit/fileapi

BUG=none
TEST=no funcational changes


Review URL: http://codereview.chromium.org/9241013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118064 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 15 deletions

diff --git a/webkit/fileapi/file_system_context.cc b/webkit/fileapi/file_system_context.cc
index 3abc454..2a806c0 100644
--- a/webkit/fileapi/file_system_context.cc
+++ b/webkit/fileapi/file_system_context.cc
@@ -8,7 +8,6 @@
 #include "base/file_util.h"
 #include "base/message_loop_proxy.h"
 #include "googleurl/src/gurl.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h"
 #include "webkit/fileapi/file_system_callback_dispatcher.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_interface.h"
@@ -196,10 +195,3 @@ FileSystemOperationInterface* FileSystemContext::CreateFileSystemOperation(
 }
 
 }  // namespace fileapi
-
-COMPILE_ASSERT(int(WebKit::WebFileSystem::TypeTemporary) == \
-               int(fileapi::kFileSystemTypeTemporary), mismatching_enums);
-COMPILE_ASSERT(int(WebKit::WebFileSystem::TypePersistent) == \
-               int(fileapi::kFileSystemTypePersistent), mismatching_enums);
-COMPILE_ASSERT(int(WebKit::WebFileSystem::TypeExternal) == \
-               int(fileapi::kFileSystemTypeExternal), mismatching_enums);
diff --git a/webkit/fileapi/file_system_types.h b/webkit/fileapi/file_system_types.h
index 1312f14..b7c96f1 100644
--- a/webkit/fileapi/file_system_types.h
+++ b/webkit/fileapi/file_system_types.h
@@ -1,13 +1,18 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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_TYPES_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_TYPES_H_
 
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebFileSystem.h"
+
 namespace fileapi {
 
 enum FileSystemType {
+  // Indicates uninitialized or invalid filesystem type.
+  kFileSystemTypeUnknown = -1,
+
   // Following two types are for TEMPORARY or PERSISTENT filesystems that
   // can be used by webapps via standard app-facing API
   // as defined in File API: Directories and System.
@@ -15,16 +20,13 @@ enum FileSystemType {
   // They are sandboxed filesystems; all the files in the filesystems are
   // placed under the profile directory with path obfuscation and quota
   // enforcement.
-  kFileSystemTypeTemporary,
-  kFileSystemTypePersistent,
+  kFileSystemTypeTemporary = WebKit::WebFileSystem::TypeTemporary,
+  kFileSystemTypePersistent = WebKit::WebFileSystem::TypePersistent,
 
   // Indicates non-sandboxed filesystem where files are placed outside the
   // profile directory (thus called 'external' filesystem).
   // This filesystem is used only by Chrome OS as of writing.
-  kFileSystemTypeExternal,
-
-  // Indicates uninitialized or invalid filesystem type.
-  kFileSystemTypeUnknown,
+  kFileSystemTypeExternal = WebKit::WebFileSystem::TypeExternal,
 };
 
 }