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

webkit/dom_storage/dom_storage_context.h

Index: webkit/dom_storage/dom_storage_context.h
diff --git a/webkit/dom_storage/dom_storage_context.h b/webkit/dom_storage/dom_storage_context.h
index 1370913d748fdc1d5f281d6c1051cfb4134c3f91..64a0db43d75396ca19ac1173cf53e6ef6ca37ae8 100644
--- a/webkit/dom_storage/dom_storage_context.h
+++ b/webkit/dom_storage/dom_storage_context.h
@@ -88,10 +88,20 @@ class DomStorageContext
     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);
 
@@ -161,7 +171,12 @@ class DomStorageContext
   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_;