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

storage/browser/fileapi/external_mount_points.h

 // Copyright (c) 2013 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_EXTERNAL_MOUNT_POINTS_H_
 #define WEBKIT_BROWSER_FILEAPI_EXTERNAL_MOUNT_POINTS_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.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_mount_option.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_mount_option.h"
+#include "storage/common/fileapi/file_system_types.h"
 
 namespace base {
 class FilePath;
 }
 
-namespace fileapi {
+namespace storage {
 
 class FileSystemURL;
 
 // Manages external filesystem namespaces that are identified by 'mount name'
 // and are persisted until RevokeFileSystem is called.
 // Files in an external filesystem are identified by a filesystem URL like:
 //
 //   filesystem:<origin>/external/<mount_name>/relative/path
 //
-class WEBKIT_STORAGE_BROWSER_EXPORT ExternalMountPoints
+class STORAGE_EXPORT ExternalMountPoints
     : public base::RefCountedThreadSafe<ExternalMountPoints>,
       public MountPoints {
  public:
   static ExternalMountPoints* GetSystemInstance();
   static scoped_refptr<ExternalMountPoints> CreateRefCounted();
 
   // Registers a new named external filesystem.
   // The |path| is registered as the root path of the mount point which
   // is identified by a URL "filesystem:.../external/mount_name".
   //
@@ skipping 54 matching lines @@
   // If a media gallery and another file system are registered for related
   // paths, only the other registration is taken into account.
   //
   // Returned virtual_path will have normalized path separators.
   bool GetVirtualPath(const base::FilePath& absolute_path,
                       base::FilePath* virtual_path) const;
 
   // Returns the virtual root path that looks like /<mount_name>.
   base::FilePath CreateVirtualRootPath(const std::string& mount_name) const;
 
-  FileSystemURL CreateExternalFileSystemURL(
-      const GURL& origin,
-      const std::string& mount_name,
-      const base::FilePath& path) const;
+  FileSystemURL CreateExternalFileSystemURL(const GURL& origin,
+                                            const std::string& mount_name,
+                                            const base::FilePath& path) const;
 
   // Revoke all registered filesystems. Used only by testing (for clean-ups).
   void RevokeAllFileSystems();
 
  private:
   friend class base::RefCountedThreadSafe<ExternalMountPoints>;
 
   // Represents each file system instance (defined in the .cc).
   class Instance;
 
@@ skipping 25 matching lines @@
 
   // This lock needs to be obtained when accessing the instance_map_.
   mutable base::Lock lock_;
 
   NameToInstance instance_map_;
   PathToName path_to_name_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalMountPoints);
 };
 
-}  // namespace fileapi
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_FILEAPI_EXTERNAL_MOUNT_POINTS_H_