DevTools: simplify the async instrumentation harness.

third_party/WebKit/Source/core/frame/DOMTimer.cpp

Index: third_party/WebKit/Source/core/frame/DOMTimer.cpp
diff --git a/third_party/WebKit/Source/core/frame/DOMTimer.cpp b/third_party/WebKit/Source/core/frame/DOMTimer.cpp
index 6eccc775383a0e6a67ba81acb40fb6b20f4e948c..c19061145dd9ce65b7bfacd15288eccbe77fb223 100644
--- a/third_party/WebKit/Source/core/frame/DOMTimer.cpp
+++ b/third_party/WebKit/Source/core/frame/DOMTimer.cpp
@@ -76,6 +76,8 @@ DOMTimer::DOMTimer(ExecutionContext* context, ScheduledAction* action, int inter
     if (shouldForwardUserGesture(interval, m_nestingLevel))
         m_userGestureToken = UserGestureIndicator::currentToken();
 
+    InspectorInstrumentation::asyncTaskScheduled(context, singleShot ? "setTimeout" : "setInterval", this, !singleShot);
+
     double intervalMilliseconds = std::max(oneMillisecond, interval * oneMillisecond);
     if (intervalMilliseconds < minimumInterval && m_nestingLevel >= maxTimerNestingLevel)
         intervalMilliseconds = minimumInterval;
@@ -107,6 +109,7 @@ void DOMTimer::fired()
 
     TRACE_EVENT1("devtools.timeline", "TimerFire", "data", InspectorTimerFireEvent::data(context, m_timeoutID));
     InspectorInstrumentationCookie cookie = InspectorInstrumentation::willFireTimer(context, m_timeoutID);
+    InspectorInstrumentation::AsyncTask asyncTask(context, this);
 
     // Simple case for non-one-shot timers.
     if (isActive()) {
@@ -141,6 +144,7 @@ void DOMTimer::fired()
 
 void DOMTimer::stop()
 {
+    InspectorInstrumentation::asyncTaskCanceled(getExecutionContext(), this);
     SuspendableTimer::stop();
     // Need to release JS objects potentially protected by ScheduledAction
     // because they can form circular references back to the ExecutionContext