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

storage/browser/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_BROWSER_FILEAPI_ISOLATED_CONTEXT_H_
 #define WEBKIT_BROWSER_FILEAPI_ISOLATED_CONTEXT_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
-#include "webkit/browser/fileapi/mount_points.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
-#include "webkit/common/fileapi/file_system_types.h"
+#include "storage/browser/fileapi/mount_points.h"
+#include "storage/common/storage_export.h"
+#include "storage/common/fileapi/file_system_types.h"
 
-namespace fileapi {
+namespace storage {
 class FileSystemURL;
 }
 
-namespace fileapi {
+namespace storage {
 
 // Manages isolated filesystem mount points which have no well-known names
 // and are identified by a string 'filesystem ID', which usually just looks
 // like random value.
 // This type of filesystem can be created on the fly and may go away when it has
 // no references from renderers.
 // Files in an isolated filesystem are registered with corresponding names and
 // identified by a filesystem URL like:
 //
 //   filesystem:<origin>/isolated/<filesystem_id>/<name>/relative/path
 //
 // Some methods of this class are virtual just for mocking.
 //
-class WEBKIT_STORAGE_BROWSER_EXPORT IsolatedContext : public MountPoints {
+class STORAGE_EXPORT IsolatedContext : public MountPoints {
  public:
-  class WEBKIT_STORAGE_BROWSER_EXPORT FileInfoSet {
+  class 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 base::FilePath& path, std::string* registered_name);
 
@@ skipping 136 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);
 };
 
-}  // namespace fileapi
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_FILEAPI_ISOLATED_CONTEXT_H_