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

content/browser/in_process_webkit/dom_storage_context_impl.cc

 // Copyright (c) 2011 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/in_process_webkit/dom_storage_context_impl.h"
 
 #ifdef ENABLE_NEW_DOM_STORAGE_BACKEND
 // This class is replaced by a new implementation in
 // content/browser/dom_storage/dom_storage_context_impl_new.h
 #else
@@ skipping 180 matching lines @@
   message_filter_set_.erase(message_filter);
 }
 
 const DOMStorageContextImpl::MessageFilterSet*
 DOMStorageContextImpl::GetMessageFilterSet() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return &message_filter_set_;
 }
 
 void DOMStorageContextImpl::PurgeMemory() {
-  if (!webkit_message_loop_->RunsTasksOnCurrentThread()) {
-    webkit_message_loop_->PostTask(
-        FROM_HERE,
-        base::Bind(&DOMStorageContextImpl::PurgeMemory, this));
-    return;
-  }
-
   // It is only safe to purge the memory from the LocalStorage namespace,
   // because it is backed by disk and can be reloaded later.  If we purge a
   // SessionStorage namespace, its data will be gone forever, because it isn't
   // currently backed by disk.
   DOMStorageNamespace* local_storage =
       GetStorageNamespace(kLocalStorageNamespaceId, false);
   if (local_storage)
     local_storage->PurgeMemory();
 }
 
@@ skipping 59 matching lines @@
   file_util::FileEnumerator file_enumerator(
       data_path_.Append(kLocalStorageDirectory), false,
       file_util::FileEnumerator::FILES);
   for (FilePath file_path = file_enumerator.Next(); !file_path.empty();
        file_path = file_enumerator.Next()) {
     if (file_path.Extension() == kLocalStorageExtension)
       file_util::Delete(file_path, false);
   }
 }
 
-void DOMStorageContextImpl::SetClearLocalState(bool clear_local_state) {
-  if (!webkit_message_loop_->RunsTasksOnCurrentThread()) {
-    webkit_message_loop_->PostTask(
-        FROM_HERE,
-        base::Bind(
-            &DOMStorageContextImpl::SetClearLocalState,
-            this, clear_local_state));
-    return;
-  }
-  clear_local_state_on_exit_ = clear_local_state;
-}
-
-void DOMStorageContextImpl::SaveSessionState() {
-  if (!webkit_message_loop_->RunsTasksOnCurrentThread()) {
-    webkit_message_loop_->PostTask(
-        FROM_HERE,
-        base::Bind(&DOMStorageContextImpl::SaveSessionState, this));
-    return;
-  }
-  save_session_state_ = true;
-}
-
 DOMStorageNamespace* DOMStorageContextImpl::CreateLocalStorage() {
   FilePath dir_path;
   if (!data_path_.empty())
     dir_path = data_path_.Append(kLocalStorageDirectory);
   DOMStorageNamespace* new_namespace =
       DOMStorageNamespace::CreateLocalStorageNamespace(this, dir_path);
   RegisterStorageNamespace(new_namespace);
   return new_namespace;
 }
 
@@ skipping 19 matching lines @@
   DOMStorageNamespace* existing_namespace =
       GetStorageNamespace(existing_id, false);
   // If nothing exists, then there's nothing to clone.
   if (existing_namespace)
     RegisterStorageNamespace(existing_namespace->Copy(clone_id));
 }
 
 void DOMStorageContextImpl::GetAllStorageFiles(
     const GetAllStorageFilesCallback& callback) {
   if (!webkit_message_loop_->RunsTasksOnCurrentThread()) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     webkit_message_loop_->PostTask(
         FROM_HERE,
         base::Bind(
             &DOMStorageContextImpl::GetAllStorageFiles, this, callback));
     return;
   }
 
   std::vector<FilePath> files;
   file_util::FileEnumerator file_enumerator(
       data_path_.Append(kLocalStorageDirectory), false,
@@ skipping 16 matching lines @@
   callback.Run(files);
 }
 
 FilePath DOMStorageContextImpl::GetFilePath(const string16& origin_id) const {
   FilePath storage_dir = data_path_.Append(kLocalStorageDirectory);
   FilePath::StringType id = webkit_glue::WebStringToFilePathString(origin_id);
   return storage_dir.Append(id.append(kLocalStorageExtension));
 }
 
 #endif  // ENABLE_NEW_DOM_STORAGE_BACKEND
+