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

storage/browser/fileapi/file_system_url.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_BROWSER_FILEAPI_FILE_SYSTEM_URL_H_
 #define WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_URL_H_
 
 #include <set>
 #include <string>
 
 #include "base/files/file_path.h"
 #include "url/gurl.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
-#include "webkit/common/fileapi/file_system_mount_option.h"
-#include "webkit/common/fileapi/file_system_types.h"
+#include "storage/common/storage_export.h"
+#include "storage/common/fileapi/file_system_mount_option.h"
+#include "storage/common/fileapi/file_system_types.h"
 
-namespace fileapi {
+namespace storage {
 
 // A class representing a filesystem URL which consists of origin URL,
 // type and an internal path used inside the filesystem.
 //
 // When a FileSystemURL instance is created for a GURL (for filesystem: scheme),
 // each accessor method would return following values:
 //
 // Example: For a URL 'filesystem:http://foo.com/temporary/foo/bar':
 //   origin() returns 'http://foo.com',
 //   mount_type() returns kFileSystemTypeTemporary,
@@ skipping 40 matching lines @@
 // <Friend>::CrackURL, <Friend>::CreateCrackedFileSystemURL, where <Friend> is
 // one of the friended classes.
 //
 // TODO(ericu): Look into making virtual_path() [and all FileSystem API virtual
 // paths] just an std::string, to prevent platform-specific base::FilePath
 // behavior from getting invoked by accident. Currently the base::FilePath
 // returned here needs special treatment, as it may contain paths that are
 // illegal on the current platform.
 // To avoid problems, use VirtualPath::BaseName and
 // VirtualPath::GetComponents instead of the base::FilePath methods.
-class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemURL {
+class STORAGE_EXPORT FileSystemURL {
  public:
   FileSystemURL();
   ~FileSystemURL();
 
   // Methods for creating FileSystemURL without attempting to crack them.
   // Should be used only in tests.
   static FileSystemURL CreateForTest(const GURL& url);
   static FileSystemURL CreateForTest(const GURL& origin,
                                      FileSystemType mount_type,
                                      const base::FilePath& virtual_path);
@@ skipping 31 matching lines @@
 
   std::string DebugString() const;
 
   // Returns true if this URL is a strict parent of the |child|.
   bool IsParent(const FileSystemURL& child) const;
 
   bool IsInSameFileSystem(const FileSystemURL& other) const;
 
   bool operator==(const FileSystemURL& that) const;
 
-  bool operator!=(const FileSystemURL& that) const {
-    return !(*this == that);
-  }
+  bool operator!=(const FileSystemURL& that) const { return !(*this == that); }
 
-  struct WEBKIT_STORAGE_BROWSER_EXPORT Comparator {
-    bool operator() (const FileSystemURL& lhs, const FileSystemURL& rhs) const;
+  struct STORAGE_EXPORT Comparator {
+    bool operator()(const FileSystemURL& lhs, const FileSystemURL& rhs) const;
   };
 
  private:
   friend class FileSystemContext;
   friend class ExternalMountPoints;
   friend class IsolatedContext;
 
   explicit FileSystemURL(const GURL& filesystem_url);
   FileSystemURL(const GURL& origin,
                 FileSystemType mount_type,
@@ skipping 22 matching lines @@
   // and the low-level file operation should be implemented with the latter.
   std::string mount_filesystem_id_;
   FileSystemType type_;
   base::FilePath path_;
   std::string filesystem_id_;
   FileSystemMountOption mount_option_;
 };
 
 typedef std::set<FileSystemURL, FileSystemURL::Comparator> FileSystemURLSet;
 
-}  // namespace fileapi
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_URL_H_