Merge 217488 "Discard FileAPI pending operations on shutdown"

webkit/browser/fileapi/file_system_context.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 "webkit/browser/fileapi/file_system_context.h"
 
 #include "base/bind.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/task_runner_util.h"
@@ skipping 156 matching lines @@
             this, quota_manager_proxy(), origin_url, iter->first)
             != base::PLATFORM_FILE_OK) {
       // Continue the loop, but record the failure.
       success = false;
     }
   }
 
   return success;
 }
 
+void FileSystemContext::Shutdown() {
+  if (!io_task_runner_->RunsTasksOnCurrentThread()) {
+    io_task_runner_->PostTask(
+        FROM_HERE, base::Bind(&FileSystemContext::Shutdown,
+                              make_scoped_refptr(this)));
+    return;
+  }
+  operation_runner_->Shutdown();
+}
+
 FileSystemQuotaUtil*
 FileSystemContext::GetQuotaUtil(FileSystemType type) const {
   FileSystemBackend* backend = GetFileSystemBackend(type);
   if (!backend)
     return NULL;
   return backend->GetQuotaUtil();
 }
 
 AsyncFileUtil* FileSystemContext::GetAsyncFileUtil(
     FileSystemType type) const {
@@ skipping 242 matching lines @@
     FileSystemType type = static_cast<FileSystemType>(t);
     if (backend->CanHandleType(type)) {
       const bool inserted = backend_map_.insert(
           std::make_pair(type, backend)).second;
       DCHECK(inserted);
     }
   }
 }
 
 }  // namespace fileapi