Merge TaskSynchronizer into WaitableEvent.

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

Index: third_party/WebKit/Source/modules/webdatabase/DatabaseTask.cpp
diff --git a/third_party/WebKit/Source/modules/webdatabase/DatabaseTask.cpp b/third_party/WebKit/Source/modules/webdatabase/DatabaseTask.cpp
index a0b9fba853dc304bfceaa9ba84bb887f70a66955..5b67d984ef1e3c4628a5e928abf6644974aafae7 100644
--- a/third_party/WebKit/Source/modules/webdatabase/DatabaseTask.cpp
+++ b/third_party/WebKit/Source/modules/webdatabase/DatabaseTask.cpp
@@ -35,9 +35,9 @@
 
 namespace blink {
 
-DatabaseTask::DatabaseTask(Database* database, TaskSynchronizer* synchronizer)
+DatabaseTask::DatabaseTask(Database* database, WaitableEvent* completeEvent)
     : m_database(database)
-    , m_synchronizer(synchronizer)
+    , m_completeEvent(completeEvent)
 #if DCHECK_IS_ON()
     , m_complete(false)
 #endif
@@ -47,7 +47,7 @@ DatabaseTask::DatabaseTask(Database* database, TaskSynchronizer* synchronizer)
 DatabaseTask::~DatabaseTask()
 {
 #if DCHECK_IS_ON()
-    ASSERT(m_complete || !m_synchronizer);
+    DCHECK(m_complete || !m_completeEvent);
 #endif
 }
 
@@ -58,7 +58,7 @@ void DatabaseTask::run()
     ASSERT(!m_complete);
 #endif
 
-    if (!m_synchronizer && !m_database->getDatabaseContext()->databaseThread()->isDatabaseOpen(m_database.get())) {
+    if (!m_completeEvent && !m_database->getDatabaseContext()->databaseThread()->isDatabaseOpen(m_database.get())) {
         taskCancelled();
 #if DCHECK_IS_ON()
         m_complete = true;
@@ -71,8 +71,8 @@ void DatabaseTask::run()
     m_database->resetAuthorizer();
     doPerformTask();
 
-    if (m_synchronizer)
-        m_synchronizer->taskCompleted();
+    if (m_completeEvent)
+        m_completeEvent->signal();
 
 #if DCHECK_IS_ON()
     m_complete = true;
@@ -82,14 +82,14 @@ void DatabaseTask::run()
 // *** DatabaseOpenTask ***
 // Opens the database file and verifies the version matches the expected version.
 
-Database::DatabaseOpenTask::DatabaseOpenTask(Database* database, bool setVersionInNewDatabase, TaskSynchronizer* synchronizer, DatabaseError& error, String& errorMessage, bool& success)
-    : DatabaseTask(database, synchronizer)
+Database::DatabaseOpenTask::DatabaseOpenTask(Database* database, bool setVersionInNewDatabase, WaitableEvent* completeEvent, DatabaseError& error, String& errorMessage, bool& success)
+    : DatabaseTask(database, completeEvent)
     , m_setVersionInNewDatabase(setVersionInNewDatabase)
     , m_error(error)
     , m_errorMessage(errorMessage)
     , m_success(success)
 {
-    ASSERT(synchronizer); // A task with output parameters is supposed to be synchronous.
+    DCHECK(completeEvent); // A task with output parameters is supposed to be synchronous.
 }
 
 void Database::DatabaseOpenTask::doPerformTask()
@@ -110,8 +110,8 @@ const char* Database::DatabaseOpenTask::debugTaskName() const
 // *** DatabaseCloseTask ***
 // Closes the database.
 
-Database::DatabaseCloseTask::DatabaseCloseTask(Database* database, TaskSynchronizer* synchronizer)
-    : DatabaseTask(database, synchronizer)
+Database::DatabaseCloseTask::DatabaseCloseTask(Database* database, WaitableEvent* completeEvent)
+    : DatabaseTask(database, completeEvent)
 {
 }
 
@@ -168,11 +168,11 @@ const char* Database::DatabaseTransactionTask::debugTaskName() const
 // *** DatabaseTableNamesTask ***
 // Retrieves a list of all tables in the database - for WebInspector support.
 
-Database::DatabaseTableNamesTask::DatabaseTableNamesTask(Database* database, TaskSynchronizer* synchronizer, Vector<String>& names)
-    : DatabaseTask(database, synchronizer)
+Database::DatabaseTableNamesTask::DatabaseTableNamesTask(Database* database, WaitableEvent* completeEvent, Vector<String>& names)
+    : DatabaseTask(database, completeEvent)
     , m_tableNames(names)
 {
-    ASSERT(synchronizer); // A task with output parameters is supposed to be synchronous.
+    DCHECK(completeEvent); // A task with output parameters is supposed to be synchronous.
 }
 
 void Database::DatabaseTableNamesTask::doPerformTask()