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

content/browser/dom_storage/dom_storage_context_impl_new.cc

Index: content/browser/dom_storage/dom_storage_context_impl_new.cc
diff --git a/content/browser/dom_storage/dom_storage_context_impl_new.cc b/content/browser/dom_storage/dom_storage_context_impl_new.cc
index cec4cdd958cef8e006c91ea261b2eed3850324e9..c65c4538c712fa27c571203b3d752f41f6b4de7b 100644
--- a/content/browser/dom_storage/dom_storage_context_impl_new.cc
+++ b/content/browser/dom_storage/dom_storage_context_impl_new.cc
@@ -27,8 +27,6 @@ using webkit_database::DatabaseUtil;
 
 namespace {
 
-const char kLocalStorageDirectory[] = "Local Storage";
-
 // TODO(michaeln): Fix the content layer api, FilePaths and
 // string16 origin_ids are just wrong. Then get rid of
 // this conversion non-sense. Most of the includes are just
@@ -67,7 +65,8 @@ void GetAllStorageFilesHelper(
   std::vector<FilePath> paths;
   for (size_t i = 0; i < infos.size(); ++i) {
     paths.push_back(
-        OriginToFullFilePath(context->directory(), infos[i].origin));
+        OriginToFullFilePath(context->GetLocalStorageDirectory(),
+                             infos[i].origin));
   }
 
   reply_loop->PostTask(
@@ -83,8 +82,7 @@ DOMStorageContextImpl::DOMStorageContextImpl(
     quota::SpecialStoragePolicy* special_storage_policy) {
   base::SequencedWorkerPool* worker_pool = BrowserThread::GetBlockingPool();
   context_ = new dom_storage::DomStorageContext(
-      data_path.empty() ?
-          data_path : data_path.AppendASCII(kLocalStorageDirectory),
+      data_path,

[michaeln, 2012/04/11 20:35:53]

Another option is to give the dom_storage class two paths, one for the
local_storage_directory and another for the session_storage_directory. This
could be nice because then the caller could independently configure locations
(including an empty path for one and not the other).

2 paths might be a cleaner interface while bringing it up too... we can pass an
empty FilePath() here in the content layer for session_dir until its really
ready to be turned on... but still have unit tests that don't pass an empty
path.

wdyt?

[marja, 2012/04/12 14:58:11]

Alright! Done.

       special_storage_policy,
       new DomStorageWorkerPoolTaskRunner(
           worker_pool,
@@ -109,7 +107,8 @@ void DOMStorageContextImpl::GetAllStorageFiles(
 
 FilePath DOMStorageContextImpl::GetFilePath(const string16& origin_id) const {
   DCHECK(context_);
-  return OriginToFullFilePath(context_->directory(), OriginIdToGURL(origin_id));
+  return OriginToFullFilePath(context_->GetLocalStorageDirectory(),
+                              OriginIdToGURL(origin_id));
 }
 
 void DOMStorageContextImpl::DeleteForOrigin(const string16& origin_id) {