Merge 243495 "Disk Cache: Use the old WorkerPool for Async IO on..."

net/disk_cache/file_posix.cc

 // 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.
 
 #include "net/disk_cache/file.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 149 matching lines @@
 
 // Static.
 void File::WaitForPendingIO(int* num_pending_io) {
   // We are running unit tests so we should wait for all callbacks. Sadly, the
   // worker pool only waits for tasks on the worker pool, not the "Reply" tasks
   // so we have to let the current message loop to run.
   s_worker_pool.Get().FlushForTesting();
   base::RunLoop().RunUntilIdle();
 }
 
+// Static.
+void File::DropPendingIO() {
+}
+
+
 File::~File() {
   if (IsValid())
     base::ClosePlatformFile(platform_file_);
 }
 
 // Runs on a worker thread.
 int File::DoRead(void* buffer, size_t buffer_len, size_t offset) {
   if (Read(const_cast<void*>(buffer), buffer_len, offset))
     return static_cast<int>(buffer_len);
 
   return net::ERR_CACHE_READ_FAILURE;
 }
 
 // Runs on a worker thread.
 int File::DoWrite(const void* buffer, size_t buffer_len, size_t offset) {
   if (Write(const_cast<void*>(buffer), buffer_len, offset))
     return static_cast<int>(buffer_len);
 
   return net::ERR_CACHE_WRITE_FAILURE;
 }
 
 // This method actually makes sure that the last reference to the file doesn't
 // go away on the worker pool.
 void File::OnOperationComplete(FileIOCallback* callback, int result) {
   callback->OnFileIOComplete(result);
 }
 
 }  // namespace disk_cache