Merge 217488 "Discard FileAPI pending operations on shutdown"

webkit/browser/fileapi/file_system_context.cc

Index: webkit/browser/fileapi/file_system_context.cc
===================================================================
--- webkit/browser/fileapi/file_system_context.cc	(revision 218648)
+++ webkit/browser/fileapi/file_system_context.cc	(working copy)
@@ -174,6 +174,16 @@
   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);