Revert of DevTools: do not use RAII for sync native breakpoints, reuse AsyncTask where possible.

third_party/WebKit/Source/core/dom/FrameRequestCallbackCollection.cpp

Index: third_party/WebKit/Source/core/dom/FrameRequestCallbackCollection.cpp
diff --git a/third_party/WebKit/Source/core/dom/FrameRequestCallbackCollection.cpp b/third_party/WebKit/Source/core/dom/FrameRequestCallbackCollection.cpp
index 550fbb1dc528808c1c148d6170fb9781255517e1..167ddabab2933155039ddfd1914ec85c9a0a2386 100644
--- a/third_party/WebKit/Source/core/dom/FrameRequestCallbackCollection.cpp
+++ b/third_party/WebKit/Source/core/dom/FrameRequestCallbackCollection.cpp
@@ -26,16 +26,19 @@
   TRACE_EVENT_INSTANT1("devtools.timeline", "RequestAnimationFrame",
                        TRACE_EVENT_SCOPE_THREAD, "data",
                        InspectorAnimationFrameEvent::data(m_context, id));
-  InspectorInstrumentation::asyncTaskScheduledBreakable(
+  InspectorInstrumentation::asyncTaskScheduled(
       m_context, "requestAnimationFrame", callback);
+  InspectorInstrumentation::NativeBreakpoint nativeBreakpoint(
+      m_context, "DOMWindow.requestAnimationFrame", true);
   return id;
 }
 
 void FrameRequestCallbackCollection::cancelCallback(CallbackId id) {
   for (size_t i = 0; i < m_callbacks.size(); ++i) {
     if (m_callbacks[i]->m_id == id) {
-      InspectorInstrumentation::asyncTaskCanceledBreakable(
-          m_context, "cancelAnimationFrame", m_callbacks[i]);
+      InspectorInstrumentation::asyncTaskCanceled(m_context, m_callbacks[i]);
+      InspectorInstrumentation::NativeBreakpoint nativeBreakpoint(
+          m_context, "DOMWindow.cancelAnimationFrame", true);
       m_callbacks.remove(i);
       TRACE_EVENT_INSTANT1("devtools.timeline", "CancelAnimationFrame",
                            TRACE_EVENT_SCOPE_THREAD, "data",
@@ -45,8 +48,9 @@
   }
   for (const auto& callback : m_callbacksToInvoke) {
     if (callback->m_id == id) {
-      InspectorInstrumentation::asyncTaskCanceledBreakable(
-          m_context, "cancelAnimationFrame", callback);
+      InspectorInstrumentation::asyncTaskCanceled(m_context, callback);
+      InspectorInstrumentation::NativeBreakpoint nativeBreakpoint(
+          m_context, "DOMWindow.cancelAnimationFrame", true);
       TRACE_EVENT_INSTANT1("devtools.timeline", "CancelAnimationFrame",
                            TRACE_EVENT_SCOPE_THREAD, "data",
                            InspectorAnimationFrameEvent::data(m_context, id));
@@ -70,8 +74,9 @@
       TRACE_EVENT1(
           "devtools.timeline", "FireAnimationFrame", "data",
           InspectorAnimationFrameEvent::data(m_context, callback->m_id));
-      InspectorInstrumentation::AsyncTask asyncTask(
-          m_context, callback, "requestAnimationFrame.callback");
+      InspectorInstrumentation::NativeBreakpoint nativeBreakpoint(
+          m_context, "DOMWindow.requestAnimationFrame.callback", false);
+      InspectorInstrumentation::AsyncTask asyncTask(m_context, callback);
       PerformanceMonitor::HandlerCall handlerCall(
           m_context, "requestAnimationFrame", true);
       if (callback->m_useLegacyTimeBase)