Adding session-only localStorage.

content/browser/in_process_webkit/dom_storage_context.h

 // Copyright (c) 2011 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_DOM_STORAGE_CONTEXT_H_
 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_CONTEXT_H_
 #pragma once
 
 #include <map>
 #include <set>
 
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "base/time.h"
+#include "content/browser/resource_context.h"
 
 class DOMStorageArea;
 class DOMStorageMessageFilter;
 class DOMStorageNamespace;
 class WebKitContext;
 
 namespace quota {
 class SpecialStoragePolicy;
 }
 
 // This is owned by WebKitContext and is all the dom storage information that's
 // shared by all the DOMStorageMessageFilters that share the same profile.  The
 // specifics of responsibilities are fairly well documented here and in
 // StorageNamespace and StorageArea.  Everything is only to be accessed on the
 // WebKit thread unless noted otherwise.
 //
 // NOTE: Virtual methods facilitate mocking functions for testing.
 class DOMStorageContext {
  public:
   DOMStorageContext(WebKitContext* webkit_context,
-                    quota::SpecialStoragePolicy* special_storage_policy);
+                    quota::SpecialStoragePolicy* special_storage_policy,
+                    const content::ResourceContext& resource_context);
   virtual ~DOMStorageContext();
 
   // Invalid storage id.  No storage session will ever report this value.
   // Used in DOMStorageMessageFilter::OnStorageAreaId when coping with
   // interactions with non-existent storage sessions.
   static const int64 kInvalidStorageId = -1;
 
   // Allocate a new storage area id.  Only call on the WebKit thread.
   int64 AllocateStorageAreaId();
 
@@ skipping 53 matching lines @@
 
   void set_clear_local_state_on_exit_(bool clear_local_state) {
     clear_local_state_on_exit_ = clear_local_state;
   }
 
 #ifdef UNIT_TEST
   // For unit tests allow to override the |data_path_|.
   void set_data_path(const FilePath& data_path) { data_path_ = data_path; }
 #endif
 
+  const content::ResourceContext& GetResourceContext() const {

[michaeln, 2011/08/04 20:21:51]

would prefer unix hacker style for this simple getter...
   resource_context()
... but see comment elsewhere about maybe not needing this data member in this
class

[marja, 2011/08/05 13:15:53]

Done. Or rather, "Gone".

+    return resource_context_;
+  }
+
  private:
   // Get the local storage instance.  The object is owned by this class.
   DOMStorageNamespace* CreateLocalStorage();
 
   // Get a new session storage namespace.  The object is owned by this class.
   DOMStorageNamespace* CreateSessionStorage(int64 namespace_id);
 
   // Used internally to register storage namespaces we create.
   void RegisterStorageNamespace(DOMStorageNamespace* storage_namespace);
 
@@ skipping 30 matching lines @@
   // Maps ids to StorageAreas.  We do NOT own these objects.  StorageNamespace
   // (which does own them) will notify us when we should remove the entries.
   typedef std::map<int64, DOMStorageArea*> StorageAreaMap;
   StorageAreaMap storage_area_map_;
 
   // Maps ids to StorageNamespaces.  We own these objects.
   typedef std::map<int64, DOMStorageNamespace*> StorageNamespaceMap;
   StorageNamespaceMap storage_namespace_map_;
 
   scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
+  const content::ResourceContext& resource_context_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageContext);
 };
 
 #endif  // CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_CONTEXT_H_