DevTools: simplify the async instrumentation harness.

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

 /*
  * Copyright (C) 2007, 2013 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 35 matching lines @@
 SQLStatement* SQLStatement::create(Database* database,
     SQLStatementCallback* callback, SQLStatementErrorCallback* errorCallback)
 {
     return new SQLStatement(database, callback, errorCallback);
 }
 
 SQLStatement::SQLStatement(Database* database, SQLStatementCallback* callback,
     SQLStatementErrorCallback* errorCallback)
     : m_statementCallback(callback)
     , m_statementErrorCallback(errorCallback)
-    , m_asyncOperationId(0)
 {
     if (hasCallback() || hasErrorCallback())
-        m_asyncOperationId = InspectorInstrumentation::traceAsyncOperationStarting(database->getExecutionContext(), "SQLStatement");
+        InspectorInstrumentation::asyncTaskScheduled(database->getExecutionContext(), "SQLStatement", this);
 }
 
 SQLStatement::~SQLStatement()
 {
 }
 
 DEFINE_TRACE(SQLStatement)
 {
     visitor->trace(m_backend);
     visitor->trace(m_statementCallback);
@@ skipping 19 matching lines @@
 {
     ASSERT(transaction);
     ASSERT(m_backend);
 
     bool callbackError = false;
 
     SQLStatementCallback* callback = m_statementCallback.release();
     SQLStatementErrorCallback* errorCallback = m_statementErrorCallback.release();
     SQLErrorData* error = m_backend->sqlError();
 
-    InspectorInstrumentationCookie cookie = InspectorInstrumentation::traceAsyncOperationCompletedCallbackStarting(transaction->database()->getExecutionContext(), m_asyncOperationId);
+    InspectorInstrumentation::AsyncTask asyncTask(transaction->database()->getExecutionContext(), this);
 
     // Call the appropriate statement callback and track if it resulted in an error,
     // because then we need to jump to the transaction error callback.
     if (error) {
         if (errorCallback)
             callbackError = errorCallback->handleEvent(transaction, SQLError::create(*error));
     } else if (callback) {
         callbackError = !callback->handleEvent(transaction, m_backend->sqlResultSet());
     }
 
-    InspectorInstrumentation::traceAsyncCallbackCompleted(cookie);
-
     return callbackError;
 }
 
 } // namespace blink