Revert 127573 - DOMStorageContextImpl that's implemented in terms of the new dom_storage classes. A…

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 127574)
+++ content/browser/dom_storage/dom_storage_context_impl_new.cc	(working copy)
@@ -1,174 +0,0 @@
-// 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::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,
-                              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()));
-}
-
-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);
-
-  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));
-}
-
-}
-
-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(
-          worker_pool,
-          worker_pool->GetNamedSequenceToken("dom_storage"),
-          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)));
-}
-
-DOMStorageContextImpl::~DOMStorageContextImpl() {
-}
-
-void DOMStorageContextImpl::GetAllStorageFiles(
-      const GetAllStorageFilesCallback& callback) {
-  DCHECK(context_);
-  context_->task_runner()->PostTask(
-      FROM_HERE,
-      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));
-}
-
-void DOMStorageContextImpl::DeleteForOrigin(const string16& origin_id) {
-  DCHECK(context_);
-  context_->task_runner()->PostTask(
-      FROM_HERE,
-      base::Bind(&DomStorageContext::DeleteOrigin, context_,
-                 OriginIdToGURL(origin_id)));
-}
-
-void DOMStorageContextImpl::DeleteLocalStorageFile(const FilePath& file_path) {
-  DCHECK(context_);
-  context_->task_runner()->PostTask(
-      FROM_HERE,
-      base::Bind(&DomStorageContext::DeleteOrigin, context_,
-                 FilePathToOrigin(file_path)));
-}
-
-void DOMStorageContextImpl::DeleteDataModifiedSince(const base::Time& cutoff) {
-  DCHECK(context_);
-  context_->task_runner()->PostTask(
-      FROM_HERE,
-      base::Bind(&DomStorageContext::DeleteDataModifiedSince, context_,
-                 cutoff));
-}
-
-void DOMStorageContextImpl::PurgeMemory() {
-  DCHECK(context_);
-  context_->task_runner()->PostTask(
-      FROM_HERE,
-      base::Bind(&DomStorageContext::PurgeMemory, context_));
-}
-
-void DOMStorageContextImpl::SetClearLocalState(bool clear_local_state) {
-  DCHECK(context_);
-  context_->task_runner()->PostTask(
-      FROM_HERE,
-      base::Bind(&DomStorageContext::SetClearLocalState, context_,
-                 clear_local_state));
-}
-
-void DOMStorageContextImpl::SaveSessionState() {
-  DCHECK(context_);
-  context_->task_runner()->PostTask(
-      FROM_HERE,
-      base::Bind(&DomStorageContext::SaveSessionState, context_));
-}
-
-void DOMStorageContextImpl::Shutdown() {
-  DCHECK(context_);
-  context_->task_runner()->PostTask(
-      FROM_HERE,
-      base::Bind(&DomStorageContext::Shutdown, context_));
-}
-
-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;
-}
-
-#endif  // ENABLE_NEW_DOM_STORAGE_BACKEND