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

content/browser/dom_storage/dom_storage_context_impl_new.cc

 // 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.
 
 #include "content/browser/dom_storage/dom_storage_context_impl_new.h"
 
 #ifdef ENABLE_NEW_DOM_STORAGE_BACKEND
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop_proxy.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "webkit/database/database_util.h"
 #include "webkit/dom_storage/dom_storage_area.h"
 #include "webkit/dom_storage/dom_storage_context.h"
 #include "webkit/dom_storage/dom_storage_task_runner.h"
 #include "webkit/glue/webkit_glue.h"
 
 using content::BrowserThread;
 using content::DOMStorageContext;
 using dom_storage::DomStorageArea;
 using dom_storage::DomStorageContext;
 using dom_storage::DomStorageTaskRunner;
 using dom_storage::DomStorageWorkerPoolTaskRunner;
 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
 // to support that non-sense.
 
 GURL OriginIdToGURL(const string16& origin_id) {
   return DatabaseUtil::GetOriginFromIdentifier(origin_id);
 }
 
 FilePath OriginToFullFilePath(const FilePath& directory,
@@ skipping 18 matching lines @@
       const DOMStorageContext::GetAllStorageFilesCallback& callback) {
   std::vector<DomStorageContext::UsageInfo> infos;
   // TODO(michaeln): Actually include the file info too when the
   // content layer api is fixed.
   const bool kDontIncludeFileInfo = false;
   context->GetUsageInfo(&infos, kDontIncludeFileInfo);
 
   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(
       FROM_HERE,
       base::Bind(&InvokeAllStorageFilesCallbackHelper,
                  callback, paths));
 }
 
 }  // namespace
 
 DOMStorageContextImpl::DOMStorageContextImpl(
     const FilePath& data_path,
     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,
           worker_pool->GetNamedSequenceToken("dom_storage_primary"),
           worker_pool->GetNamedSequenceToken("dom_storage_commit"),
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
 }
 
 DOMStorageContextImpl::~DOMStorageContextImpl() {
 }
 
 void DOMStorageContextImpl::GetAllStorageFiles(
       const GetAllStorageFilesCallback& callback) {
   DCHECK(context_);
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
       DomStorageTaskRunner::PRIMARY_SEQUENCE,
       base::Bind(&GetAllStorageFilesHelper,
                  base::MessageLoopProxy::current(),
                  context_, callback));
 }
 
 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) {
   DCHECK(context_);
   context_->task_runner()->PostShutdownBlockingTask(
       FROM_HERE,
       DomStorageTaskRunner::PRIMARY_SEQUENCE,
       base::Bind(&DomStorageContext::DeleteOrigin, context_,
                  OriginIdToGURL(origin_id)));
 }
@@ skipping 54 matching lines @@
   DCHECK(context_);
   int64 clone_id = context_->AllocateSessionId();
   context_->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&DomStorageContext::CloneSessionNamespace, context_,
                  existing_namespace_id, clone_id));
   return clone_id;
 }
 
 #endif  // ENABLE_NEW_DOM_STORAGE_BACKEND