Remove ExecutionContextTask subclasses from DOMFileSystem

third_party/WebKit/Source/modules/filesystem/DirectoryReader.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 82 matching lines @@
 }
 
 void DirectoryReader::readEntries(EntriesCallback* entriesCallback, ErrorCallback* errorCallback)
 {
     if (!m_isReading) {
         m_isReading = true;
         filesystem()->readDirectory(this, m_fullPath, new EntriesCallbackHelper(this), new ErrorCallbackHelper(this));
     }
 
     if (m_error) {
-        filesystem()->scheduleCallback(errorCallback, m_error);
+        filesystem()->reportError(errorCallback, m_error.get());
         return;
     }
 
     if (m_entriesCallback) {
         // Non-null m_entriesCallback means multiple readEntries() calls are made concurrently. We don't allow doing it.
-        filesystem()->scheduleCallback(errorCallback, FileError::create(FileError::INVALID_STATE_ERR));
+        filesystem()->reportError(errorCallback, FileError::create(FileError::INVALID_STATE_ERR));
         return;
     }
 
     if (!m_hasMoreEntries || !m_entries.isEmpty()) {
-        filesystem()->scheduleCallback(entriesCallback, m_entries);
+        if (entriesCallback)
+            DOMFileSystem::scheduleCallback(filesystem()->getExecutionContext(), createSameThreadTask(&EntriesCallback::handleEvent, wrapPersistent(entriesCallback), PersistentHeapVector<Member<Entry>>(m_entries)));
         m_entries.clear();
         return;
     }
 
     m_entriesCallback = entriesCallback;
     m_errorCallback = errorCallback;
 }
 
 void DirectoryReader::addEntries(const EntryHeapVector& entries)
 {
@@ skipping 20 matching lines @@
 DEFINE_TRACE(DirectoryReader)
 {
     visitor->trace(m_entries);
     visitor->trace(m_error);
     visitor->trace(m_entriesCallback);
     visitor->trace(m_errorCallback);
     DirectoryReaderBase::trace(visitor);
 }
 
 } // namespace blink