DomStorageArea -> DomStorageDatabase indirection; add *StorageDatabaseAdapter.

webkit/dom_storage/session_storage_database_adapter.h

Index: webkit/dom_storage/session_storage_database_adapter.h
diff --git a/webkit/dom_storage/session_storage_database_adapter.h b/webkit/dom_storage/session_storage_database_adapter.h
new file mode 100644
index 0000000000000000000000000000000000000000..a6f1d58df970ade6c9a22914851f3437bf13ffc4
--- /dev/null
+++ b/webkit/dom_storage/session_storage_database_adapter.h
@@ -0,0 +1,36 @@
+// Copyright (c) 2012 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_DOM_STORAGE_SESSION_STORAGE_DATABASE_ADAPTER_H_
+#define WEBKIT_DOM_STORAGE_SESSION_STORAGE_DATABASE_ADAPTER_H_
+#pragma once
+
+#include "base/memory/ref_counted.h"
+#include "googleurl/src/gurl.h"
+#include "webkit/dom_storage/dom_storage_database_adapter.h"
+
+namespace dom_storage {
+
+class SessionStorageDatabase;
+
+class SessionStorageDatabaseAdapter : public DomStorageDatabaseAdapter {
+ public:
+  SessionStorageDatabaseAdapter(SessionStorageDatabase* db,
+                                const std::string& namespace_id,

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

might be nice to name this param and the data member as persistent_namespace_id 

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

Done.

+                                const GURL& origin);
+  virtual ~SessionStorageDatabaseAdapter();
+  virtual void ReadAllValues(ValuesMap* result) OVERRIDE;
+  virtual bool CommitChanges(bool clear_all_first,
+                             const ValuesMap& changes) OVERRIDE;
+ private:
+  scoped_refptr<SessionStorageDatabase> db_;
+  std::string namespace_id_;
+  GURL origin_;
+
+  DISALLOW_COPY_AND_ASSIGN(SessionStorageDatabaseAdapter);
+};
+
+}  // namespace dom_storage
+
+#endif  // WEBKIT_DOM_STORAGE_SESSION_STORAGE_DATABASE_ADAPTER_H_