DomStorageArea -> DomStorageDatabase indirection; add *StorageDatabaseAdapter.

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 af43c821a4e206cb20e0670d12db6343a315d64c..c599256c57f8432c4f33eace6ea269a395deb3d4 100644
--- a/webkit/dom_storage/dom_storage_area.h
+++ b/webkit/dom_storage/dom_storage_area.h
@@ -9,14 +9,16 @@
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/nullable_string16.h"
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/dom_storage/dom_storage_database.h"
+#include "webkit/dom_storage/dom_storage_database_adapter.h"
 #include "webkit/dom_storage/dom_storage_types.h"
 
 namespace dom_storage {
 
+class DomStorageDatabaseAdapter;

[michaeln, 2012/06/15 19:02:43]

either the #include or this forward isn't really needed

[marja, 2012/06/19 10:43:30]

Done (forward declaration is enough).

 class DomStorageMap;
 class DomStorageTaskRunner;
 
@@ -108,7 +110,7 @@ class DomStorageArea
   FilePath directory_;
   scoped_refptr<DomStorageTaskRunner> task_runner_;
   scoped_refptr<DomStorageMap> map_;
-  scoped_ptr<DomStorageDatabase> backing_;
+  scoped_ptr<DomStorageDatabaseAdapter> backing_;
   bool is_initial_import_done_;
   bool is_shutdown_;
   scoped_ptr<CommitBatch> commit_batch_;