Don't hardcode the "Local Storage" directory name in DomStorageContext.

webkit/dom_storage/dom_storage_context.h

 // 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_DOM_STORAGE_CONTEXT_H_
 #define WEBKIT_DOM_STORAGE_DOM_STORAGE_CONTEXT_H_
 #pragma once
 
 #include <map>
 #include <vector>
@@ skipping 70 matching lines @@
         const DomStorageArea* area,
         const string16& key,
         const string16& old_value,
         const GURL& page_url) = 0;
     virtual void OnDomStorageAreaCleared(
         const DomStorageArea* area,
         const GURL& page_url) = 0;
     virtual ~EventObserver() {}
   };
 
-  DomStorageContext(const FilePath& directory,  // empty for incognito profiles
-                    quota::SpecialStoragePolicy* special_storage_policy,
-                    DomStorageTaskRunner* task_runner);
-  const FilePath& directory() const { return directory_; }
+  DomStorageContext(
+      const FilePath& localstorage_directory,  // empty for incognito profiles
+      const FilePath& sessionstorage_directory,  // empty for incognito profiles
+      quota::SpecialStoragePolicy* special_storage_policy,
+      DomStorageTaskRunner* task_runner);
+
+  // Returns the directory path for localStorage, or an empty directory, if
+  // there is no backing on disk.
+  FilePath localstorage_directory() { return localstorage_directory_; }
+
+  // Returns the directory path for sessionStorage, or an empty directory, if
+  // there is no backing on disk.
+  FilePath sessionstorage_directory() { return sessionstorage_directory_; }

[michaeln, 2012/04/12 18:35:38]

can these be const FilePath& return values instead?

[marja, 2012/04/13 07:56:10]

Afaics yes. Done.

+
   DomStorageTaskRunner* task_runner() const { return task_runner_; }
   DomStorageNamespace* GetStorageNamespace(int64 namespace_id);
 
   void GetUsageInfo(std::vector<UsageInfo>* infos, bool include_file_info);
   void DeleteOrigin(const GURL& origin);
   void DeleteDataModifiedSince(const base::Time& cutoff);
   void PurgeMemory();
 
   // Used by content settings to alter the behavior around
   // what data to keep and what data to discard at shutdown.
@@ skipping 49 matching lines @@
       StorageNamespaceMap;
 
   ~DomStorageContext();
 
   void ClearLocalStateInCommitSequence();
 
   // Collection of namespaces keyed by id.
   StorageNamespaceMap namespaces_;
 
   // Where localstorage data is stored, maybe empty for the incognito use case.
-  FilePath directory_;
+  FilePath localstorage_directory_;
+
+  // Where sessionstorage data is stored, maybe empty for the incognito use
+  // case. Always empty until the file-backed session storage feature is
+  // implemented.
+  FilePath sessionstorage_directory_;
 
   // Used to schedule sequenced background tasks.
   scoped_refptr<DomStorageTaskRunner> task_runner_;
 
   // List of objects observing local storage events.
   ObserverList<EventObserver> event_observers_;
 
   // We use a 32 bit identifier for per tab storage sessions.
   // At a tab per second, this range is large enough for 68 years.
   base::AtomicSequenceNumber session_id_sequence_;
 
   bool is_shutdown_;
   bool clear_local_state_;
   bool save_session_state_;
   scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy_;
 };
 
 }  // namespace dom_storage
 
 #endif  // WEBKIT_DOM_STORAGE_DOM_STORAGE_CONTEXT_H_