Disk cache: Remove all non essential synchronization from the cache destructor.

net/disk_cache/in_flight_io.cc

Index: net/disk_cache/in_flight_io.cc
===================================================================
--- net/disk_cache/in_flight_io.cc	(revision 126788)
+++ net/disk_cache/in_flight_io.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -11,7 +11,7 @@
 namespace disk_cache {
 
 BackgroundIO::BackgroundIO(InFlightIO* controller)
-    : controller_(controller), result_(-1), io_completed_(true, false) {
+    : result_(-1), io_completed_(true, false), controller_(controller) {
 }
 
 // Runs on the primary thread.
@@ -21,15 +21,13 @@
 }
 
 void BackgroundIO::Cancel() {
+  // controller_ may be in use from the background thread at this time.
+  base::AutoLock lock(controller_lock_);
   DCHECK(controller_);
   controller_ = NULL;
 }
 
-BackgroundIO::~BackgroundIO() {}
-
-// Runs on the background thread.
-void BackgroundIO::NotifyController() {
-  controller_->OnIOComplete(this);
+BackgroundIO::~BackgroundIO() {
 }
 
 // ---------------------------------------------------------------------------
@@ -42,6 +40,13 @@
 InFlightIO::~InFlightIO() {
 }
 
+// Runs on the background thread.
+void BackgroundIO::NotifyController() {
+  base::AutoLock lock(controller_lock_);
+  if (controller_)
+    controller_->OnIOComplete(this);
+}
+
 void InFlightIO::WaitForPendingIO() {
   while (!io_list_.empty()) {
     // Block the current thread until all pending IO completes.
@@ -50,6 +55,16 @@
   }
 }
 
+void InFlightIO::DropPendingIO() {
+  while (!io_list_.empty()) {
+    IOList::iterator it = io_list_.begin();
+    BackgroundIO* operation = *it;
+    operation->Cancel();
+    DCHECK(io_list_.find(operation) != io_list_.end());
+    io_list_.erase(make_scoped_refptr(operation));
+  }
+}
+
 // Runs on a background thread.
 void InFlightIO::OnIOComplete(BackgroundIO* operation) {
 #ifndef NDEBUG