Integrated obfuscation with quota; all unit tests now pass

webkit/fileapi/obfuscated_file_system_file_util.h

 // Copyright (c) 2011 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_FILEAPI_OBFUSCATED_FILE_SYSTEM_FILE_UTIL_H_
 #define WEBKIT_FILEAPI_OBFUSCATED_FILE_SYSTEM_FILE_UTIL_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 105 matching lines @@
   virtual bool DirectoryExists(
       FileSystemOperationContext* context,
       const FilePath& file_path) OVERRIDE;
 
   virtual bool IsDirectoryEmpty(
       FileSystemOperationContext* context,
       const FilePath& file_path) OVERRIDE;
 
   // Gets the topmost directory specific to this origin and type.  This will
   // contain both the directory database's files and all the backing file
-  // subdirectories.  If we decide to migrate in-place, without moving old files
-  // that were created by LocalFileSystemFileUtil, not all backing files will
-  // actually be in this directory.
+  // subdirectories.
   FilePath GetDirectoryForOriginAndType(
       const GURL& origin, FileSystemType type, bool create);
 
   // Gets the topmost directory specific to this origin.  This will
-  // contain both the filesystem type subdirectories.  See previous comment
-  // about migration; TODO(ericu): implement migration and fix these comments.
+  // contain both the filesystem type subdirectories.
   FilePath GetDirectoryForOrigin(const GURL& origin, bool create);
 
   // This will migrate a filesystem from the old passthrough sandbox into the
   // new obfuscated one.  It won't obfuscate the old filenames [it will maintain
   // the old structure, but move it to a new root], but any new files created
   // will go into the new standard locations.  This will be completely
   // transparent to the user.  This migration is atomic in that it won't alter
   // the source data until it's done, and that will be with a single directory
   // move [the directory with the unguessable name will move into the new
   // filesystem storage directory].  However, if this fails partway through, it
   // might leave a seemingly-valid database for this origin.  When it starts up,
   // it will clear any such database, just in case.
   bool MigrateFromOldSandbox(
       const GURL& origin, FileSystemType type, const FilePath& root);
 
-  FilePath::StringType GetDirectoryNameForType(FileSystemType type) const;
+  // TODO(ericu): This doesn't really feel like it belongs in this class.
+  // The previous version lives in FileSystemPathManager, but perhaps
+  // SandboxMountPointProvider would be better?
+  static FilePath::StringType GetDirectoryNameForType(FileSystemType type);
+
+  // Origin enumerator interface.
+  // An instance of this interface is assumed to be called on the file thread.
+  class AbstractOriginEnumerator {
+   public:
+    virtual ~AbstractOriginEnumerator() {}
+
+    // Returns the next origin.  Returns empty if there are no more origins.
+    virtual GURL Next() = 0;
+
+    // Returns the current origin's information.
+    virtual bool HasFileSystemType(FileSystemType type) const = 0;
+  };
+
+  // This method and all methods of its returned class must be called only on
+  // the FILE thread.  The caller is responsible for deleting the returned
+  // object.
+  AbstractOriginEnumerator* CreateOriginEnumerator();
 
  protected:
   virtual AbstractFileEnumerator* CreateFileEnumerator(
       FileSystemOperationContext* context,
       const FilePath& root_path) OVERRIDE;
 
  private:
   typedef FileSystemDirectoryDatabase::FileId FileId;
   typedef FileSystemDirectoryDatabase::FileInfo FileInfo;
 
@@ skipping 27 matching lines @@
   FilePath DataPathToLocalPath(
       const GURL& origin, FileSystemType type, const FilePath& data_path);
   // This does the reverse of DataPathToLocalPath.
   FilePath LocalPathToDataPath(
       const GURL& origin, FileSystemType type, const FilePath& local_path);
   FileSystemDirectoryDatabase* GetDirectoryDatabase(
       const GURL& origin_url, FileSystemType type);
   void MarkUsed();
   void DropDatabases();
   bool DestroyDirectoryDatabase(const GURL& origin, FileSystemType type);
+  bool InitOriginDatabase(bool create);
 
   typedef std::map<std::string, FileSystemDirectoryDatabase*> DirectoryMap;
   DirectoryMap directories_;
   scoped_ptr<FileSystemOriginDatabase> origin_database_;
   FilePath file_system_directory_;
   base::OneShotTimer<ObfuscatedFileSystemFileUtil> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(ObfuscatedFileSystemFileUtil);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_OBFUSCATED_FILE_SYSTEM_FILE_UTIL_H_