Integrated obfuscation with quota; all unit tests now pass

webkit/fileapi/sandbox_mount_point_provider.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_SANDBOX_MOUNT_POINT_PROVIDER_H_
 #define WEBKIT_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 78 matching lines @@
   virtual std::vector<FilePath> GetRootDirectories() const;
 
   // Returns an origin enumerator of this provider.
   // This method is supposed to be called on the file thread.
   OriginEnumerator* CreateOriginEnumerator() const;
 
   // Gets a base directory path of the sandboxed filesystem that is
   // specified by |origin_url|.
   // (The path is similar to the origin's root path but doesn't contain
   // the 'unique' and 'type' part.)
-  // This method is portable and can be called on any thread.
-  // TODO(ericu) obfuscated version for quota integration.
-  FilePath GetBaseDirectoryForOrigin(const GURL& origin_url) const;
+  // This method can only be called on the file thread.
+  FilePath GetBaseDirectoryForOrigin(const GURL& origin_url, bool create) const;
 
   // Gets a base directory path of the sandboxed filesystem that is
   // specified by |origin_url| and |type|.
   // (The path is similar to the origin's root path but doesn't contain
   // the 'unique' part.)
   // Returns an empty path if the given type is invalid.
-  // This method is portable and can be called on any thread.
-  // TODO(ericu) obfuscated version for quota integration.
+  // This method can only be called on the file thread.
   FilePath GetBaseDirectoryForOriginAndType(
       const GURL& origin_url,
-      fileapi::FileSystemType type) const;
+      fileapi::FileSystemType type,
+      bool create) const;
 
   FileSystemFileUtil* GetFileSystemFileUtil();
 
   // Deletes the data on the origin and reports the amount of deleted data
   // to the quota manager via |proxy|.
   bool DeleteOriginDataOnFileThread(
       quota::QuotaManagerProxy* proxy,
       const GURL& origin_url,
       fileapi::FileSystemType type);
 
@@ skipping 31 matching lines @@
       const GURL& origin_url,
       FilePath* base_path,
       FileSystemType type,
       std::string* name);
 
   // Returns a path to the usage cache file.
   FilePath GetUsageCachePathForOriginAndType(
       const GURL& origin_url,
       fileapi::FileSystemType type) const;
 
-  FilePath GetFileSystemRootPathOnFileThread(
-      const GURL& origin_url, FileSystemType type, bool create);
-
   class GetFileSystemRootPathTask;
 
   friend class FileSystemTestOriginHelper;
 
   // The path_manager_ isn't owned by this instance; this instance is owned by
   // the path_manager_, and they have the same lifetime.
   FileSystemPathManager* path_manager_;
 
   scoped_refptr<base::MessageLoopProxy> file_message_loop_;
 
   const FilePath base_path_;
 
   scoped_refptr<ObfuscatedFileSystemFileUtil> sandbox_file_util_;
 
   // Acccessed only on the file thread.
   std::set<GURL> visited_origins_;
 
   DISALLOW_COPY_AND_ASSIGN(SandboxMountPointProvider);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_