Revert 50296 (Causes DCHECK failures) - Make CookieMonster NonThreadSafe....

chrome/browser/extensions/extension_data_deleter.cc

Index: chrome/browser/extensions/extension_data_deleter.cc
===================================================================
--- chrome/browser/extensions/extension_data_deleter.cc	(revision 50356)
+++ chrome/browser/extensions/extension_data_deleter.cc	(working copy)
@@ -23,28 +23,18 @@
 
 void ExtensionDataDeleter::StartDeleting() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
-
-  ChromeThread::PostTask(
-      ChromeThread::IO, FROM_HERE,
-      NewRunnableMethod(this, &ExtensionDataDeleter::DeleteCookiesOnIOThread));
-
-  ChromeThread::PostTask(
-      ChromeThread::WEBKIT, FROM_HERE,
-      NewRunnableMethod(
-          this, &ExtensionDataDeleter::DeleteLocalStorageOnWebkitThread));
-
-  ChromeThread::PostTask(
-      ChromeThread::FILE, FROM_HERE,
-      NewRunnableMethod(
-          this, &ExtensionDataDeleter::DeleteDatabaseOnFileThread));
-}
-
-void ExtensionDataDeleter::DeleteCookiesOnIOThread() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
   net::CookieMonster* cookie_monster =
       extension_request_context_->GetCookieStore()->GetCookieMonster();
   if (cookie_monster)
     cookie_monster->DeleteAllForURL(extension_url_, true);
+
+  ChromeThread::PostTask(ChromeThread::WEBKIT, FROM_HERE,
+      NewRunnableMethod(this,
+          &ExtensionDataDeleter::DeleteLocalStorageOnWebkitThread));
+
+  ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE,
+      NewRunnableMethod(this,
+          &ExtensionDataDeleter::DeleteDatabaseOnFileThread));
 }
 
 void ExtensionDataDeleter::DeleteDatabaseOnFileThread() {