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

webkit/browser/fileapi/obfuscated_file_util.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_OBFUSCATED_FILE_UTIL_H_
 #define WEBKIT_BROWSER_FILEAPI_OBFUSCATED_FILE_UTIL_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 16 matching lines @@
 namespace base {
 class SequencedTaskRunner;
 class TimeTicks;
 }
 
 namespace content {
 class ObfuscatedFileUtilTest;
 class QuotaBackendImplTest;
 }
 
-namespace quota {
+namespace storage {
 class SpecialStoragePolicy;
 }
 
 class GURL;
 
-namespace fileapi {
+namespace storage {
 
 class FileSystemOperationContext;
 class SandboxOriginDatabaseInterface;
 class TimedTaskHelper;
 
 // This file util stores directory information in LevelDB to obfuscate
 // and to neutralize virtual file paths given by arbitrary apps.
 // Files are stored with two-level isolation: per-origin and per-type.
 // The isolation is done by storing data in separate directory partitions.
 // For example, a file in Temporary file system for origin 'www.example.com'
@@ skipping 40 matching lines @@
   // to provide per-type isolation in the sandboxed filesystem directory.
   // Note that this method is called on file_task_runner.
   //
   // |known_type_strings| are known type string names that this file system
   // should care about.
   // This info is used to determine whether we could delete the entire
   // origin directory or not in DeleteDirectoryForOriginAndType. If no directory
   // for any known type exists the origin directory may get deleted when
   // one origin/type pair is deleted.
   //
-  ObfuscatedFileUtil(
-      quota::SpecialStoragePolicy* special_storage_policy,
-      const base::FilePath& file_system_directory,
-      leveldb::Env* env_override,
-      base::SequencedTaskRunner* file_task_runner,
-      const GetTypeStringForURLCallback& get_type_string_for_url,
-      const std::set<std::string>& known_type_strings,
-      SandboxFileSystemBackendDelegate* sandbox_delegate);
+  ObfuscatedFileUtil(storage::SpecialStoragePolicy* special_storage_policy,
+                     const base::FilePath& file_system_directory,
+                     leveldb::Env* env_override,
+                     base::SequencedTaskRunner* file_task_runner,
+                     const GetTypeStringForURLCallback& get_type_string_for_url,
+                     const std::set<std::string>& known_type_strings,
+                     SandboxFileSystemBackendDelegate* sandbox_delegate);
   virtual ~ObfuscatedFileUtil();
 
   // FileSystemFileUtil overrides.
   virtual base::File CreateOrOpen(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
       int file_flags) OVERRIDE;
   virtual base::File::Error EnsureFileExists(
       FileSystemOperationContext* context,
       const FileSystemURL& url, bool* created) OVERRIDE;
@@ skipping 32 matching lines @@
   virtual base::File::Error CopyInForeignFile(
         FileSystemOperationContext* context,
         const base::FilePath& src_file_path,
         const FileSystemURL& dest_url) OVERRIDE;
   virtual base::File::Error DeleteFile(
       FileSystemOperationContext* context,
       const FileSystemURL& url) OVERRIDE;
   virtual base::File::Error DeleteDirectory(
       FileSystemOperationContext* context,
       const FileSystemURL& url) OVERRIDE;
-  virtual webkit_blob::ScopedFile CreateSnapshotFile(
+  virtual storage::ScopedFile CreateSnapshotFile(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
       base::File::Error* error,
       base::File::Info* file_info,
       base::FilePath* platform_path) OVERRIDE;
 
   // Same as the other CreateFileEnumerator, but with recursive support.
   scoped_ptr<AbstractFileEnumerator> CreateFileEnumerator(
       FileSystemOperationContext* context,
       const FileSystemURL& root_url,
@@ skipping 55 matching lines @@
   typedef SandboxDirectoryDatabase::FileInfo FileInfo;
 
   friend class ObfuscatedFileEnumerator;
   friend class content::ObfuscatedFileUtilTest;
   friend class content::QuotaBackendImplTest;
 
   // Helper method to create an obfuscated file util for regular
   // (temporary, persistent) file systems. Used only for testing.
   // Note: this is implemented in sandbox_file_system_backend_delegate.cc.
   static ObfuscatedFileUtil* CreateForTesting(
-      quota::SpecialStoragePolicy* special_storage_policy,
+      storage::SpecialStoragePolicy* special_storage_policy,
       const base::FilePath& file_system_directory,
       leveldb::Env* env_override,
       base::SequencedTaskRunner* file_task_runner);
 
   base::FilePath GetDirectoryForURL(
       const FileSystemURL& url,
       bool create,
       base::File::Error* error_code);
 
   // This just calls get_type_string_for_url_ callback that is given in ctor.
@@ skipping 78 matching lines @@
   base::File CreateOrOpenInternal(
       FileSystemOperationContext* context,
       const FileSystemURL& url,
       int file_flags);
 
   bool HasIsolatedStorage(const GURL& origin);
 
   typedef std::map<std::string, SandboxDirectoryDatabase*> DirectoryMap;
   DirectoryMap directories_;
   scoped_ptr<SandboxOriginDatabaseInterface> origin_database_;
-  scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
+  scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy_;
   base::FilePath file_system_directory_;
   leveldb::Env* env_override_;
 
   // Used to delete database after a certain period of inactivity.
   int64 db_flush_delay_seconds_;
 
   scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
   scoped_ptr<TimedTaskHelper> timer_;
 
   GetTypeStringForURLCallback get_type_string_for_url_;
   std::set<std::string> known_type_strings_;
 
   // Not owned.
   SandboxFileSystemBackendDelegate* sandbox_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ObfuscatedFileUtil);
 };
 
-}  // namespace fileapi
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_FILEAPI_OBFUSCATED_FILE_UTIL_H_