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

webkit/fileapi/isolated_context.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_ISOLATED_CONTEXT_H_
 #define WEBKIT_FILEAPI_ISOLATED_CONTEXT_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
+#include "base/lazy_instance.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
-#include "base/lazy_instance.h"
 #include "webkit/fileapi/file_system_types.h"
-#include "webkit/fileapi/fileapi_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace fileapi {
 
 // Manages isolated filesystem namespaces.
 // This context class is a singleton and access to the context is
 // thread-safe (protected with a lock).
 //
 // There are two types of filesystems managed by this context:
 // isolated and external.
 // The former is transient while the latter is persistent.
@@ skipping 15 matching lines @@
 //
 // A filesystem instance is represented by IsolatedContext::Instance, and
 // managed as a map instance_map_ which maps from filesystem ID (or name)
 // to the instance.
 //
 // Some methods of this class are virtual just for mocking.
 //
 // TODO(kinuko): This should have a better name since this handles both
 // isolated and external file systems.
 //
-class FILEAPI_EXPORT IsolatedContext {
+class WEBKIT_STORAGE_EXPORT IsolatedContext {
  public:
-  struct FILEAPI_EXPORT FileInfo {
+  struct WEBKIT_STORAGE_EXPORT FileInfo {
     FileInfo();
     FileInfo(const std::string& name, const FilePath& path);
 
     // The name to be used to register the file. The registered file can
     // be referred by a virtual path /<filesystem_id>/<name>.
     // The name should NOT contain a path separator '/'.
     std::string name;
 
     // The path of the file.
     FilePath path;
 
     // For STL operation.
     bool operator<(const FileInfo& that) const { return name < that.name; }
   };
 
-  class FILEAPI_EXPORT FileInfoSet {
+  class WEBKIT_STORAGE_EXPORT FileInfoSet {
    public:
     FileInfoSet();
     ~FileInfoSet();
 
     // Add the given |path| to the set and populates |registered_name| with
     // the registered name assigned for the path. |path| needs to be
     // absolute and should not contain parent references.
     // Return false if the |path| is not valid and could not be added.
     bool AddPath(const FilePath& path, std::string* registered_name);
 
@@ skipping 153 matching lines @@
   // This lock needs to be obtained when accessing the instance_map_.
   mutable base::Lock lock_;
 
   IDToInstance instance_map_;
   PathToID path_to_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(IsolatedContext);
 };
 
 // Registers a scoped external filesystem which gets revoked when it scopes out.
-class FILEAPI_EXPORT ScopedExternalFileSystem {
+class WEBKIT_STORAGE_EXPORT ScopedExternalFileSystem {
  public:
   ScopedExternalFileSystem(const std::string& mount_name,
                            FileSystemType type,
                            const FilePath& path);
   ~ScopedExternalFileSystem();
 
   FilePath GetVirtualRootPath() const;
 
  private:
   const std::string mount_name_;
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_ISOLATED_CONTEXT_H_