Move storage-related files from webkit/ to new top-level directory storage/

storage/browser/fileapi/file_system_options.h

Index: storage/browser/fileapi/file_system_options.h
diff --git a/webkit/browser/fileapi/file_system_options.h b/storage/browser/fileapi/file_system_options.h
similarity index 80%
rename from webkit/browser/fileapi/file_system_options.h
rename to storage/browser/fileapi/file_system_options.h
index 25133dac21ce3349ab08e5f619323bbf3db4feea..623cccbaae5c6dce0956a3fd7e30d0258c057f61 100644
--- a/webkit/browser/fileapi/file_system_options.h
+++ b/storage/browser/fileapi/file_system_options.h
@@ -8,22 +8,19 @@
 #include <string>
 #include <vector>
 
-#include "webkit/browser/webkit_storage_browser_export.h"
+#include "storage/common/storage_export.h"
 
 namespace leveldb {
 class Env;
 }
 
-namespace fileapi {
+namespace storage {
 
 // Provides runtime options that may change FileSystem API behavior.
 // This object is copyable.
-class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemOptions {
+class STORAGE_EXPORT FileSystemOptions {
  public:
-  enum ProfileMode {
-    PROFILE_MODE_NORMAL = 0,
-    PROFILE_MODE_INCOGNITO
-  };
+  enum ProfileMode { PROFILE_MODE_NORMAL = 0, PROFILE_MODE_INCOGNITO };
 
   // |profile_mode| specifies if the profile (for this filesystem)
   // is running in incognito mode (PROFILE_MODE_INCOGNITO) or no
@@ -31,10 +28,9 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemOptions {
   // |additional_allowed_schemes| specifies schemes that are allowed
   // to access FileSystem API in addition to "http" and "https".
   // Non-NULL |env_override| overrides internal LevelDB environment.
-  FileSystemOptions(
-      ProfileMode profile_mode,
-      const std::vector<std::string>& additional_allowed_schemes,
-      leveldb::Env* env_override);
+  FileSystemOptions(ProfileMode profile_mode,
+                    const std::vector<std::string>& additional_allowed_schemes,
+                    leveldb::Env* env_override);
 
   ~FileSystemOptions();
 
@@ -57,6 +53,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemOptions {
   leveldb::Env* env_override_;
 };
 
-}  // namespace fileapi
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_OPTIONS_H_