Framing for a DOMStorage backend that does not depend on in-process-webkit.

webkit/dom_storage/dom_storage_session.h

Index: webkit/dom_storage/dom_storage_session.h
===================================================================
--- webkit/dom_storage/dom_storage_session.h	(revision 0)
+++ webkit/dom_storage/dom_storage_session.h	(working copy)
@@ -1,46 +1,37 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 CONTENT_BROWSER_IN_PROCESS_WEBKIT_SESSION_STORAGE_NAMESPACE_H_
-#define CONTENT_BROWSER_IN_PROCESS_WEBKIT_SESSION_STORAGE_NAMESPACE_H_
+#ifndef WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_
+#define WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "content/common/content_export.h"
 
-class WebKitContext;
+namespace dom_storage {
 
-// This is a ref-counted class that represents a SessionStorageNamespace.
-// On destruction it ensures that the storage namespace is destroyed.
-// NOTE: That if we're shutting down, we don't strictly need to do this, but
-//       it keeps valgrind happy.
-class SessionStorageNamespace
-    : public base::RefCountedThreadSafe<SessionStorageNamespace> {
+class DOMStorageContext;
+
+class DOMStorageSession

[marja, 2012/01/24 10:00:56]

DOMSessionStorage instead of DOMStorageSession?

[jsbell, 2012/01/24 19:37:25]

Add a comment explaining the use of this type, as you have for DOMStorageHost. I
think that would clear up the naming confusion.

+    : public base::RefCountedThreadSafe<DOMStorageSession> {
  public:
-  explicit SessionStorageNamespace(WebKitContext* context);
+  explicit DOMStorageSession(DOMStorageContext* context);
+  int64 namespace_id() const { return namespace_id_; }
+  DOMStorageSession* Clone();
 
-  int64 id() const { return id_; }
-
-  // The session storage namespace parameter allows multiple render views and
-  // tab contentses to share the same session storage (part of the WebStorage
-  // spec) space. Passing in NULL simply allocates a new one which is often the
-  // correct thing to do (especially in tests.
-  SessionStorageNamespace* Clone();
-
  private:
-  SessionStorageNamespace(WebKitContext* webkit_context, int64 id);
+  DOMStorageSession(DOMStorageContext* context, int64 namespace_id);
 
-  friend class base::RefCountedThreadSafe<SessionStorageNamespace>;
-  CONTENT_EXPORT ~SessionStorageNamespace();
+  friend class base::RefCountedThreadSafe<DOMStorageContext>;
+  ~DOMStorageSession();
 
-  scoped_refptr<WebKitContext> webkit_context_;
+  scoped_refptr<DOMStorageContext> context_;
+  int64 namespace_id_;
 
-  // The session storage namespace id.
-  int64 id_;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(SessionStorageNamespace);
+  DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageSession);
 };
 
-#endif  // CONTENT_BROWSER_IN_PROCESS_WEBKIT_SESSION_STORAGE_NAMESPACE_H_
+}  // namespace dom_storage
+
+#endif  // WEBKIT_DOM_STORAGE_DOM_STORAGE_AREA_H_