Transmit breakpoint id on paused event

runtime/vm/debugger_api_impl_test.cc

Index: runtime/vm/debugger_api_impl_test.cc
===================================================================
--- runtime/vm/debugger_api_impl_test.cc	(revision 31028)
+++ runtime/vm/debugger_api_impl_test.cc	(working copy)
@@ -389,6 +389,7 @@
 
 
 static void InspectOptimizedStack_Breakpoint(Dart_IsolateId isolate_id,
+                                             intptr_t bp_id,
                                              const Dart_CodeLocation& loc) {
   Dart_StackTrace trace;
   Dart_GetStackTrace(&trace);
@@ -583,6 +584,7 @@
 
 
 void TestStepOutHandler(Dart_IsolateId isolate_id,
+                        intptr_t bp_id,
                         const Dart_CodeLocation& location) {
   Dart_StackTrace trace;
   Dart_GetStackTrace(&trace);
@@ -647,6 +649,7 @@
 
 
 void TestStepIntoHandler(Dart_IsolateId isolate_id,
+                         intptr_t bp_id,
                          const Dart_CodeLocation& location) {
   Dart_StackTrace trace;
   Dart_GetStackTrace(&trace);
@@ -728,6 +731,7 @@
 
 
 static void StepIntoHandler(Dart_IsolateId isolate_id,
+                            intptr_t bp_id,
                             const Dart_CodeLocation& location) {
   Dart_StackTrace trace;
   Dart_GetStackTrace(&trace);
@@ -810,6 +814,7 @@
 
 
 void TestSingleStepHandler(Dart_IsolateId isolate_id,
+                           intptr_t bp_id,
                            const Dart_CodeLocation& location) {
   Dart_StackTrace trace;
   Dart_GetStackTrace(&trace);
@@ -869,6 +874,7 @@
 
 
 static void ClosureBreakpointHandler(Dart_IsolateId isolate_id,
+                                     intptr_t bp_id,
                                      const Dart_CodeLocation& location) {
   Dart_StackTrace trace;
   Dart_GetStackTrace(&trace);
@@ -923,6 +929,7 @@
 
 
 static void ExprClosureBreakpointHandler(Dart_IsolateId isolate_id,
+                                         intptr_t bp_id,
                                          const Dart_CodeLocation& location) {
   Dart_StackTrace trace;
   Dart_GetStackTrace(&trace);
@@ -971,6 +978,7 @@
 static intptr_t bp_id_to_be_deleted;
 
 static void DeleteBreakpointHandler(Dart_IsolateId isolate_id,
+                                    intptr_t bp_id,
                                     const Dart_CodeLocation& location) {
   Dart_StackTrace trace;
   Dart_GetStackTrace(&trace);
@@ -997,7 +1005,8 @@
   // Remove the breakpoint after we've hit it twice
   if (breakpoint_hit_counter == 2) {
     if (verbose) OS::Print("uninstalling breakpoint\n");
-    Dart_Handle res = Dart_RemoveBreakpoint(bp_id_to_be_deleted);
+    EXPECT_EQ(bp_id_to_be_deleted, bp_id);
+    Dart_Handle res = Dart_RemoveBreakpoint(bp_id);
     EXPECT_VALID(res);
   }
 }
@@ -1041,6 +1050,7 @@
 
 
 static void InspectStaticFieldHandler(Dart_IsolateId isolate_id,
+                                      intptr_t bp_id,
                                       const Dart_CodeLocation& location) {
   Dart_StackTrace trace;
   Dart_GetStackTrace(&trace);
@@ -1419,6 +1429,7 @@
 
 static void StackTraceDump1BreakpointHandler(
                 Dart_IsolateId isolate_id,
+                intptr_t bp_id,
                 const Dart_CodeLocation& location) {
   Dart_StackTrace trace;
   Dart_GetStackTrace(&trace);
@@ -1736,6 +1747,7 @@
 
 
 void TestEvaluateHandler(Dart_IsolateId isolate_id,
+                         intptr_t bp_id,
                          const Dart_CodeLocation& location) {
   Dart_StackTrace trace;
   Dart_GetStackTrace(&trace);