DomStorage data deletion and memory purging.

content/browser/dom_storage/dom_storage_context_impl_new.cc

Index: content/browser/dom_storage/dom_storage_context_impl_new.cc
===================================================================
--- content/browser/dom_storage/dom_storage_context_impl_new.cc	(revision 127981)
+++ content/browser/dom_storage/dom_storage_context_impl_new.cc	(working copy)
@@ -45,8 +45,7 @@
 
 GURL FilePathToOrigin(const FilePath& path) {
   DCHECK(path.MatchesExtension(DomStorageArea::kDatabaseFileExtension));
-  return OriginIdToGURL(
-      webkit_glue::FilePathToWebString(path.BaseName().RemoveExtension()));
+  return DomStorageArea::OriginFromDatabaseFileName(path);
 }
 
 void InvokeAllStorageFilesCallbackHelper(
@@ -60,7 +59,10 @@
       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) {
@@ -74,7 +76,7 @@
                  callback, paths));
 }
 
-}
+}  // namespace
 
 DOMStorageContextImpl::DOMStorageContextImpl(
     const FilePath& data_path,