webkit: Merge blob and fileapi into one build target 'storage'

webkit/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_FILEAPI_FILE_SYSTEM_URL_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_URL_H_
 
 #include <string>
 
 #include "base/platform_file.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/fileapi/file_system_types.h"
-#include "webkit/fileapi/fileapi_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace fileapi {
 
 // 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 regular sandbox file systems
 // each accessor method would return following values:
 //
 // Example: For a URL 'filesystem:http://foo.com/temporary/foo/bar':
@@ skipping 16 matching lines @@
 //   virtual_path() returns 'mount_name/foo/bar',
 //   filesystem_id() returns 'mount_name', and
 //   mount_type() returns kFileSystemTypeExternal.
 //
 // TODO(ericu): Look into making path() [and all FileSystem API virtual
 // paths] just an std::string, to prevent platform-specific FilePath behavior
 // from getting invoked by accident. Currently the 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 FilePath methods.
-class FILEAPI_EXPORT FileSystemURL {
+class WEBKIT_STORAGE_EXPORT FileSystemURL {
  public:
   FileSystemURL();
   explicit FileSystemURL(const GURL& filesystem_url);
   FileSystemURL(const GURL& origin,
                 FileSystemType type,
                 const FilePath& internal_path);
   ~FileSystemURL();
 
   // Returns true if this instance represents a valid FileSystem URL.
   bool is_valid() const { return is_valid_; }
@@ skipping 30 matching lines @@
   // Note that the resulting FileSystemURL always has an empty virtual_path
   // (as virtual_path is meant to represent the path that is given in the
   // original filesystem: URL in the current implementation).
   FileSystemURL WithPath(const FilePath& path) const;
 
   // Returns true if this URL is a strict parent of the |child|.
   bool IsParent(const FileSystemURL& child) const;
 
   bool operator==(const FileSystemURL& that) const;
 
-  struct FILEAPI_EXPORT Comparator {
+  struct WEBKIT_STORAGE_EXPORT Comparator {
     bool operator() (const FileSystemURL& lhs, const FileSystemURL& rhs) const;
   };
 
  private:
   void MayCrackIsolatedPath();
 
   GURL origin_;
   FileSystemType type_;
   FilePath path_;
 
   // For isolated filesystem.
   std::string filesystem_id_;
   FilePath virtual_path_;
   FileSystemType mount_type_;
 
   bool is_valid_;
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_URL_H_