Merge 152532 - Quota double-delete fix

webkit/quota/quota_task.cc

Index: webkit/quota/quota_task.cc
===================================================================
--- webkit/quota/quota_task.cc	(revision 154997)
+++ webkit/quota/quota_task.cc	(working copy)
@@ -30,7 +30,8 @@
 
 QuotaTask::QuotaTask(QuotaTaskObserver* observer)
     : observer_(observer),
-      original_task_runner_(base::MessageLoopProxy::current()) {
+      original_task_runner_(base::MessageLoopProxy::current()),
+      delete_scheduled_(false) {
 }
 
 void QuotaTask::CallCompleted() {
@@ -48,6 +49,10 @@
 }
 
 void QuotaTask::DeleteSoon() {
+  DCHECK(original_task_runner_->BelongsToCurrentThread());
+  if (delete_scheduled_)
+    return;
+  delete_scheduled_ = true;
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }