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

storage/browser/fileapi/external_mount_points.cc

 // 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.
 
-#include "webkit/browser/fileapi/external_mount_points.h"
+#include "storage/browser/fileapi/external_mount_points.h"
 
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
-#include "webkit/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/file_system_url.h"
 
 namespace {
 
 // Normalizes file path so it has normalized separators and ends with exactly
 // one separator. Paths have to be normalized this way for use in
 // GetVirtualPath method. Separators cannot be completely stripped, or
 // GetVirtualPath could not working in some edge cases.
 // For example, /a/b/c(1)/d would be erroneously resolved as c/d if the
 // following mount points were registered: "/a/b/c", "/a/b/c(1)". (Note:
 // "/a/b/c" < "/a/b/c(1)" < "/a/b/c/").
 base::FilePath NormalizeFilePath(const base::FilePath& path) {
   if (path.empty())
     return path;
 
   base::FilePath::StringType path_str = path.StripTrailingSeparators().value();
   if (!base::FilePath::IsSeparator(path_str[path_str.length() - 1]))
     path_str.append(FILE_PATH_LITERAL("/"));
 
   return base::FilePath(path_str).NormalizePathSeparators();
 }
 
-bool IsOverlappingMountPathForbidden(fileapi::FileSystemType type) {
-  return type != fileapi::kFileSystemTypeNativeMedia &&
-      type != fileapi::kFileSystemTypeDeviceMedia;
+bool IsOverlappingMountPathForbidden(storage::FileSystemType type) {
+  return type != storage::kFileSystemTypeNativeMedia &&
+         type != storage::kFileSystemTypeDeviceMedia;
 }
 
 // Wrapper around ref-counted ExternalMountPoints that will be used to lazily
 // create and initialize LazyInstance system ExternalMountPoints.
 class SystemMountPointsLazyWrapper {
  public:
   SystemMountPointsLazyWrapper()
-      : system_mount_points_(fileapi::ExternalMountPoints::CreateRefCounted()) {
+      : system_mount_points_(storage::ExternalMountPoints::CreateRefCounted()) {
   }
 
   ~SystemMountPointsLazyWrapper() {}
 
-  fileapi::ExternalMountPoints* get() {
-    return system_mount_points_.get();
-  }
+  storage::ExternalMountPoints* get() { return system_mount_points_.get(); }
 
  private:
-  scoped_refptr<fileapi::ExternalMountPoints> system_mount_points_;
+  scoped_refptr<storage::ExternalMountPoints> system_mount_points_;
 };
 
 base::LazyInstance<SystemMountPointsLazyWrapper>::Leaky
     g_external_mount_points = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
-namespace fileapi {
+namespace storage {
 
 class ExternalMountPoints::Instance {
  public:
   Instance(FileSystemType type,
            const base::FilePath& path,
            const FileSystemMountOption& mount_option)
       : type_(type),
         path_(path.StripTrailingSeparators()),
         mount_option_(mount_option) {}
   ~Instance() {}
@@ skipping 55 matching lines @@
   if (found == instance_map_.end())
     return false;
   Instance* instance = found->second;
   if (IsOverlappingMountPathForbidden(instance->type()))
     path_to_name_map_.erase(NormalizeFilePath(instance->path()));
   delete found->second;
   instance_map_.erase(found);
   return true;
 }
 
-bool ExternalMountPoints::GetRegisteredPath(
-    const std::string& filesystem_id, base::FilePath* path) const {
+bool ExternalMountPoints::GetRegisteredPath(const std::string& filesystem_id,
+                                            base::FilePath* path) const {
   DCHECK(path);
   base::AutoLock locker(lock_);
   NameToInstance::const_iterator found = instance_map_.find(filesystem_id);
   if (found == instance_map_.end())
     return false;
   *path = found->second->path();
   return true;
 }
 
 bool ExternalMountPoints::CrackVirtualPath(
@@ skipping 57 matching lines @@
     FileSystemType type,
     const base::FilePath& path) const {
   return CrackFileSystemURL(FileSystemURL(origin, type, path));
 }
 
 void ExternalMountPoints::AddMountPointInfosTo(
     std::vector<MountPointInfo>* mount_points) const {
   base::AutoLock locker(lock_);
   DCHECK(mount_points);
   for (NameToInstance::const_iterator iter = instance_map_.begin();
-       iter != instance_map_.end(); ++iter) {
+       iter != instance_map_.end();
+       ++iter) {
     mount_points->push_back(MountPointInfo(iter->first, iter->second->path()));
   }
 }
 
 bool ExternalMountPoints::GetVirtualPath(const base::FilePath& path_in,
                                          base::FilePath* virtual_path) const {
   DCHECK(virtual_path);
 
   base::AutoLock locker(lock_);
 
@@ skipping 13 matching lines @@
     const std::string& mount_name) const {
   return base::FilePath().AppendASCII(mount_name);
 }
 
 FileSystemURL ExternalMountPoints::CreateExternalFileSystemURL(
     const GURL& origin,
     const std::string& mount_name,
     const base::FilePath& path) const {
   return CreateCrackedFileSystemURL(
       origin,
-      fileapi::kFileSystemTypeExternal,
+      storage::kFileSystemTypeExternal,
       // Avoid using FilePath::Append as path may be an absolute path.
-      base::FilePath(
-          CreateVirtualRootPath(mount_name).value() +
-          base::FilePath::kSeparators[0] + path.value()));
+      base::FilePath(CreateVirtualRootPath(mount_name).value() +
+                     base::FilePath::kSeparators[0] + path.value()));
 }
 
 void ExternalMountPoints::RevokeAllFileSystems() {
   NameToInstance instance_map_copy;
   {
     base::AutoLock locker(lock_);
     instance_map_copy = instance_map_;
     instance_map_.clear();
     path_to_name_map_.clear();
   }
   STLDeleteContainerPairSecondPointers(instance_map_copy.begin(),
                                        instance_map_copy.end());
 }
 
-ExternalMountPoints::ExternalMountPoints() {}
+ExternalMountPoints::ExternalMountPoints() {
+}
 
 ExternalMountPoints::~ExternalMountPoints() {
   STLDeleteContainerPairSecondPointers(instance_map_.begin(),
                                        instance_map_.end());
 }
 
 FileSystemURL ExternalMountPoints::CrackFileSystemURL(
     const FileSystemURL& url) const {
   if (!HandlesFileSystemMountType(url.type()))
     return FileSystemURL();
 
   base::FilePath virtual_path = url.path();
   if (url.type() == kFileSystemTypeNativeForPlatformApp) {
 #if defined(OS_CHROMEOS)
     // On Chrome OS, find a mount point and virtual path for the external fs.
     if (!GetVirtualPath(url.path(), &virtual_path))
       return FileSystemURL();
 #else
     // On other OS, it is simply a native local path.
-    return FileSystemURL(
-        url.origin(), url.mount_type(), url.virtual_path(),
-        url.mount_filesystem_id(), kFileSystemTypeNativeLocal,
-        url.path(), url.filesystem_id(), url.mount_option());
+    return FileSystemURL(url.origin(),
+                         url.mount_type(),
+                         url.virtual_path(),
+                         url.mount_filesystem_id(),
+                         kFileSystemTypeNativeLocal,
+                         url.path(),
+                         url.filesystem_id(),
+                         url.mount_option());
 #endif
   }
 
   std::string mount_name;
   FileSystemType cracked_type;
   std::string cracked_id;
   base::FilePath cracked_path;
   FileSystemMountOption cracked_mount_option;
 
-  if (!CrackVirtualPath(virtual_path, &mount_name, &cracked_type,
-                        &cracked_id, &cracked_path, &cracked_mount_option)) {
+  if (!CrackVirtualPath(virtual_path,
+                        &mount_name,
+                        &cracked_type,
+                        &cracked_id,
+                        &cracked_path,
+                        &cracked_mount_option)) {
     return FileSystemURL();
   }
 
   return FileSystemURL(
-      url.origin(), url.mount_type(), url.virtual_path(),
+      url.origin(),
+      url.mount_type(),
+      url.virtual_path(),
       !url.filesystem_id().empty() ? url.filesystem_id() : mount_name,
-      cracked_type, cracked_path,
-      cracked_id.empty() ? mount_name : cracked_id, cracked_mount_option);
+      cracked_type,
+      cracked_path,
+      cracked_id.empty() ? mount_name : cracked_id,
+      cracked_mount_option);
 }
 
 bool ExternalMountPoints::ValidateNewMountPoint(const std::string& mount_name,
                                                 FileSystemType type,
                                                 const base::FilePath& path) {
   lock_.AssertAcquired();
 
   // Mount name must not be empty.
   if (mount_name.empty())
     return false;
@@ skipping 28 matching lines @@
       if (potential_child->first == path ||
           path.IsParent(potential_child->first)) {
         return false;
       }
     }
   }
 
   return true;
 }
 
-}  // namespace fileapi
+}  // namespace storage