Update the DOMStorageContext public interface in the content layer to remove FilePaths and origin_i…

content/browser/dom_storage/dom_storage_context_impl.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.h"
 
 #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 content {
+DOMStorageContext::UsageInfo::UsageInfo() : data_size(0) {}
+DOMStorageContext::UsageInfo::~UsageInfo() {}
+}
+
 namespace {
 
 const char kLocalStorageDirectory[] = "Local Storage";
 
+void InvokeUsageInfoCallbackHelper(
+      const DOMStorageContext::GetUsageInfoCallback& callback,
+      const std::vector<DOMStorageContext::UsageInfo>* infos) {
+  callback.Run(*infos);
+}
+
+void GetUsageInfoHelper(
+      base::MessageLoopProxy* reply_loop,
+      DomStorageContext* context,
+      const DOMStorageContext::GetUsageInfoCallback& callback) {
+  std::vector<DomStorageContext::UsageInfo> infos;
+  const bool kIncludeFileInfo = true;
+  context->GetUsageInfo(&infos, kIncludeFileInfo);
+
+  std::vector<DOMStorageContext::UsageInfo>* public_infos =
+      new std::vector<DOMStorageContext::UsageInfo>(infos.size());
+  for (size_t i = 0; i < infos.size(); ++i) {
+    (*public_infos)[i].origin = infos[i].origin;
+    (*public_infos)[i].data_size = infos[i].data_size;
+    (*public_infos)[i].last_modified = infos[i].last_modified;
+  }
+
+  reply_loop->PostTask(
+      FROM_HERE,
+      base::Bind(&InvokeUsageInfoCallbackHelper,
+                 callback, base::Owned(public_infos)));
+}
+
 // 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 51 matching lines @@
       new DomStorageWorkerPoolTaskRunner(
           worker_pool,
           worker_pool->GetNamedSequenceToken("dom_storage_primary"),
           worker_pool->GetNamedSequenceToken("dom_storage_commit"),
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
 }
 
 DOMStorageContextImpl::~DOMStorageContextImpl() {
 }
 
+void DOMStorageContextImpl::GetUsageInfo(const GetUsageInfoCallback& callback) {
+  DCHECK(context_);
+  context_->task_runner()->PostShutdownBlockingTask(
+      FROM_HERE,
+      DomStorageTaskRunner::PRIMARY_SEQUENCE,
+      base::Bind(&GetUsageInfoHelper,
+                 base::MessageLoopProxy::current(),
+                 context_, callback));
+}
+
+void DOMStorageContextImpl::DeleteOrigin(const GURL& origin) {
+  DCHECK(context_);
+  context_->task_runner()->PostShutdownBlockingTask(
+      FROM_HERE,
+      DomStorageTaskRunner::PRIMARY_SEQUENCE,
+      base::Bind(&DomStorageContext::DeleteOrigin, context_, origin));
+}
+
 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));
 }
@@ skipping 67 matching lines @@
 int64 DOMStorageContextImpl::LeakyCloneSessionStorage(
     int64 existing_namespace_id) {
   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;
 }