Make the content::DOMStorageContext methods callable on the main thread and hide the threading deta…

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"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 186 matching lines @@
   // 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();
 }
 
 void DOMStorageContextImpl::DeleteDataModifiedSince(const base::Time& cutoff) {
+  if (!webkit_message_loop_->RunsTasksOnCurrentThread()) {
+    webkit_message_loop_->PostTask(
+        FROM_HERE,
+        base::Bind(
+            &DOMStorageContextImpl::DeleteDataModifiedSince, this, cutoff));
+    return;
+  }
+
   // Make sure that we don't delete a database that's currently being accessed
   // by unloading all of the databases temporarily.
   PurgeMemory();
 
   file_util::FileEnumerator file_enumerator(
       data_path_.Append(kLocalStorageDirectory), false,
       file_util::FileEnumerator::FILES);
   for (FilePath path = file_enumerator.Next(); !path.value().empty();
        path = file_enumerator.Next()) {
     GURL origin(WebSecurityOrigin::createFromDatabaseIdentifier(
         webkit_glue::FilePathToWebString(path.BaseName())).toString());
     if (special_storage_policy_->IsStorageProtected(origin))
       continue;
 
     file_util::FileEnumerator::FindInfo find_info;
     file_enumerator.GetFindInfo(&find_info);
     if (file_util::HasFileBeenModifiedSince(find_info, cutoff))
       file_util::Delete(path, false);
   }
 }
 
 void DOMStorageContextImpl::DeleteLocalStorageFile(const FilePath& file_path) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
+  if (!webkit_message_loop_->RunsTasksOnCurrentThread()) {
+    webkit_message_loop_->PostTask(
+        FROM_HERE,
+        base::Bind(
+            &DOMStorageContextImpl::DeleteLocalStorageFile, this, file_path));
+    return;
+  }
 
   // Make sure that we don't delete a database that's currently being accessed
   // by unloading all of the databases temporarily.
   // TODO(bulach): both this method and DeleteDataModifiedSince could purge
   // only the memory used by the specific file instead of all memory at once.
   // See http://crbug.com/32000
   PurgeMemory();
   file_util::Delete(file_path, false);
 }
 
 void DOMStorageContextImpl::DeleteForOrigin(const string16& origin_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
   DeleteLocalStorageFile(GetFilePath(origin_id));
 }
 
 void DOMStorageContextImpl::DeleteAllLocalStorageFiles() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
 
   // Make sure that we don't delete a database that's currently being accessed
   // by unloading all of the databases temporarily.
   PurgeMemory();
 
@@ skipping 36 matching lines @@
 void DOMStorageContextImpl::CompleteCloningSessionStorage(
     int64 existing_id, int64 clone_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
   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));
 }
 
-base::SequencedTaskRunner* DOMStorageContextImpl::task_runner() const {
-  return webkit_message_loop_;
-}
+void DOMStorageContextImpl::GetAllStorageFiles(
+    GetAllStorageFilesCallback callback) {
+  if (!webkit_message_loop_->RunsTasksOnCurrentThread()) {
+    webkit_message_loop_->PostTask(
+        FROM_HERE,
+        base::Bind(
+            &DOMStorageContextImpl::GetAllStorageFiles, this, callback));
+    return;
+  }
 
-std::vector<FilePath> DOMStorageContextImpl::GetAllStorageFiles() {
   std::vector<FilePath> files;
   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)
       files.push_back(file_path);
   }
-  return files;
+
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&DOMStorageContextImpl::RunAllStorageFilesCallback,
+                 this, files, callback));
+}
+
+void DOMStorageContextImpl::RunAllStorageFilesCallback(
+    const std::vector<FilePath>& files, GetAllStorageFilesCallback callback) {

[michaeln, 2012/03/15 01:43:40]

const ref here too

[jam, 2012/03/15 04:06:17]

Done.

+  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));
 }