Hook up DomStorageArea with a DomStorageDatabase.

webkit/dom_storage/dom_storage_area.h

Index: webkit/dom_storage/dom_storage_area.h
diff --git a/webkit/dom_storage/dom_storage_area.h b/webkit/dom_storage/dom_storage_area.h
index 0c4a0d5edcf5fb116cde66bb2f4ea9d830b8216c..a4425216695ee75ea697ffcb068e162917dbb965 100644
--- a/webkit/dom_storage/dom_storage_area.h
+++ b/webkit/dom_storage/dom_storage_area.h
@@ -11,6 +11,7 @@
 #include "base/nullable_string16.h"
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
+#include "webkit/dom_storage/dom_storage_database.h"

[michaeln, 2012/02/14 06:39:26]

instead of directly including, i think this could just be a forward decl in the
.h file

[benm (inactive), 2012/02/14 11:12:07]

I think it needs to be #included as it's used in a scoped_ptr rather than a
scoped_refptr.

 #include "webkit/dom_storage/dom_storage_task_runner.h"
 
 class FilePath;
@@ -47,8 +48,15 @@ class DomStorageArea
 
  private:
   FRIEND_TEST_ALL_PREFIXES(DomStorageAreaTest, DomStorageAreaBasics);
+  FRIEND_TEST_ALL_PREFIXES(DomStorageAreaTest, BackingDatabaseOpened);
+  FRIEND_TEST_ALL_PREFIXES(DomStorageAreaTest, TestDatabaseFilePath);
   friend class base::RefCountedThreadSafe<DomStorageArea>;
 
+  void InitialImportIfNeeded();
+  void SyncToBacking();

[michaeln, 2012/02/14 06:39:26]

should we stick with the CommitChanges terminology at to match whats used in
DomStorageDatabase?

[benm (inactive), 2012/02/14 11:12:07]

Done.

+
+  static FilePath DatabaseFileNameFromOrigin(const GURL& origin);
+
   ~DomStorageArea();
 
   int64 namespace_id_;
@@ -56,8 +64,10 @@ class DomStorageArea
   FilePath directory_;
   scoped_refptr<DomStorageTaskRunner> task_runner_;
   scoped_refptr<DomStorageMap> map_;
-  // TODO(benm): integrate with DomStorageDatabase to read from
-  // and lazily write to disk.
+  scoped_ptr<DomStorageDatabase> backing_;
+  bool initial_import_done_;
+  ValuesMap items_to_sync_;

[michaeln, 2012/02/14 06:39:26]

if switching terminology, changed_values_?

[benm (inactive), 2012/02/14 11:12:07]

Done.

+  bool clear_all_next_sync_;
 };
 
 }  // namespace dom_storage