Replace createCrossThreadTask with crossThreadBind in webdatabase

third_party/WebKit/Source/modules/webdatabase/DatabaseTracker.cpp

 /*
  * Copyright (C) 2011 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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "modules/webdatabase/DatabaseTracker.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
-#include "core/dom/ExecutionContextTask.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "modules/webdatabase/Database.h"
 #include "modules/webdatabase/DatabaseClient.h"
 #include "modules/webdatabase/DatabaseContext.h"
 #include "modules/webdatabase/QuotaTracker.h"
 #include "modules/webdatabase/sqlite/SQLiteFileSystem.h"
+#include "platform/CrossThreadFunctional.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/weborigin/SecurityOriginHash.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebDatabaseObserver.h"
 #include "public/platform/WebSecurityOrigin.h"
 #include "public/platform/WebTraceLocation.h"
 #include "wtf/Assertions.h"
 #include "wtf/Functional.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/StdLibExtras.h"
@@ skipping 128 matching lines @@
   DatabaseNameMap* nameMap = m_openDatabaseMap->at(originString);
   if (!nameMap)
     return;
 
   DatabaseSet* databaseSet = nameMap->at(name);
   if (!databaseSet)
     return;
 
   // We have to call closeImmediately() on the context thread.
   for (DatabaseSet::iterator it = databaseSet->begin();
-       it != databaseSet->end(); ++it)
-    (*it)->getDatabaseContext()->getExecutionContext()->postTask(
-        TaskType::DatabaseAccess, BLINK_FROM_HERE,
-        createCrossThreadTask(&DatabaseTracker::closeOneDatabaseImmediately,
-                              crossThreadUnretained(this), originString, name,
-                              *it));
+       it != databaseSet->end(); ++it) {
+    (*it)->getDatabaseTaskRunner()->postTask(
+        BLINK_FROM_HERE,
+        crossThreadBind(&DatabaseTracker::closeOneDatabaseImmediately,
+                        crossThreadUnretained(this), originString, name, *it));
+  }
 }
 
 void DatabaseTracker::forEachOpenDatabaseInPage(
     Page* page,
     std::unique_ptr<DatabaseCallback> callback) {
   MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
   if (!m_openDatabaseMap)
     return;
   for (auto& originMap : *m_openDatabaseMap) {
     for (auto& nameDatabaseSet : *originMap.value) {
@@ skipping 28 matching lines @@
     if (found == databaseSet->end())
       return;
   }
 
   // And we have to call closeImmediately() without our collection lock being
   // held.
   database->closeImmediately();
 }
 
 }  // namespace blink