Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

webkit/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 "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
@@ skipping 12 matching lines @@
   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 168 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();
   }
@@ skipping 85 matching lines @@
       if (potential_child->first == path ||
           path.IsParent(potential_child->first)) {
         return false;
       }
     }
   }
 
   return true;
 }
 
-}  // namespace fileapi
+}  // namespace storage