DomStorage data deletion and memory purging.

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"
@@ skipping 27 matching lines @@
   return DatabaseUtil::GetOriginFromIdentifier(origin_id);
 }
 
 FilePath OriginToFullFilePath(const FilePath& directory,
                               const GURL& origin) {
   return directory.Append(DomStorageArea::DatabaseFileNameFromOrigin(origin));
 }
 
 GURL FilePathToOrigin(const FilePath& path) {
   DCHECK(path.MatchesExtension(DomStorageArea::kDatabaseFileExtension));
-  return OriginIdToGURL(
-      webkit_glue::FilePathToWebString(path.BaseName().RemoveExtension()));
+  return DomStorageArea::OriginFromDatabaseFileName(path);
 }
 
 void InvokeAllStorageFilesCallbackHelper(
       const DOMStorageContext::GetAllStorageFilesCallback& callback,
       const std::vector<FilePath>& file_paths) {
   callback.Run(file_paths);
 }
 
 void GetAllStorageFilesHelper(
       base::MessageLoopProxy* reply_loop,
       DomStorageContext* context,
       const DOMStorageContext::GetAllStorageFilesCallback& callback) {
   std::vector<DomStorageContext::UsageInfo> infos;
-  context->GetUsageInfo(&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));
   }
 
   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),
       special_storage_policy,
       new DomStorageWorkerPoolTaskRunner(
@@ skipping 87 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