Integrated obfuscation with quota; all unit tests now pass

webkit/fileapi/file_system_origin_database.h

Index: webkit/fileapi/file_system_origin_database.h
diff --git a/webkit/fileapi/file_system_origin_database.h b/webkit/fileapi/file_system_origin_database.h
index 1a2808298d10dd813297e1963d25c2069dcac7bb..885d165f5fd2cde7cb6fd3d1c0f4d29e2366f4e5 100644
--- a/webkit/fileapi/file_system_origin_database.h
+++ b/webkit/fileapi/file_system_origin_database.h
@@ -19,7 +19,14 @@ namespace fileapi {
 // the browser's FILE thread.  The constructor may be used on any thread.
 class FileSystemOriginDatabase {
  public:
-  typedef std::pair<std::string, FilePath> OriginRecord;
+  struct OriginRecord {
+    std::string origin;
+    FilePath path;
+
+    OriginRecord();
+    OriginRecord(const std::string& origin, const FilePath& path);
+    ~OriginRecord();
+  };
 
   // Only one instance of FileSystemOriginDatabase should exist for a given path
   // at a given time.