Remove ExecutionContextTask subclasses from DOMFileSystem

third_party/WebKit/Source/modules/filesystem/FileSystemCallbacks.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 68 matching lines @@
 
 bool FileSystemCallbacksBase::shouldScheduleCallback() const
 {
     return !shouldBlockUntilCompletion() && m_executionContext && m_executionContext->activeDOMObjectsAreSuspended();
 }
 
 template <typename CB, typename CBArg>
 void FileSystemCallbacksBase::handleEventOrScheduleCallback(CB* callback, CBArg* arg)
 {
     ASSERT(callback);
-    if (shouldScheduleCallback())
-        DOMFileSystem::scheduleCallback(m_executionContext.get(), callback, arg);
-    else if (callback)
-        callback->handleEvent(arg);
+    if (callback) {
+        if (shouldScheduleCallback())
+            DOMFileSystem::scheduleCallback(m_executionContext.get(), createSameThreadTask(&CB::handleEvent, wrapPersistent(callback), wrapPersistent(arg)));
+        else
+            callback->handleEvent(arg);
+    }
     m_executionContext.clear();
 }
 
 template <typename CB>
 void FileSystemCallbacksBase::handleEventOrScheduleCallback(CB* callback)
 {
     ASSERT(callback);
-    if (shouldScheduleCallback())
-        DOMFileSystem::scheduleCallback(m_executionContext.get(), callback);
-    else if (callback)
-        callback->handleEvent();
+    if (callback) {
+        if (shouldScheduleCallback())
+            DOMFileSystem::scheduleCallback(m_executionContext.get(), createSameThreadTask(&CB::handleEvent, wrapPersistent(callback)));
+        else
+            callback->handleEvent();
+    }
     m_executionContext.clear();
 }
 
 // EntryCallbacks -------------------------------------------------------------
 
 std::unique_ptr<AsyncFileSystemCallbacks> EntryCallbacks::create(EntryCallback* successCallback, ErrorCallback* errorCallback, ExecutionContext* context, DOMFileSystemBase* fileSystem, const String& expectedPath, bool isDirectory)
 {
     return wrapUnique(new EntryCallbacks(successCallback, errorCallback, context, fileSystem, expectedPath, isDirectory));
 }
 
@@ skipping 180 matching lines @@
 {
 }
 
 void VoidCallbacks::didSucceed()
 {
     if (m_successCallback)
         handleEventOrScheduleCallback(m_successCallback.release());
 }
 
 } // namespace blink