Reapply "Per-closure breakpoints; restructure breakpoint implementation to keep a list of condition…

runtime/vm/json_stream.cc

Index: runtime/vm/json_stream.cc
diff --git a/runtime/vm/json_stream.cc b/runtime/vm/json_stream.cc
index e1cf409b64961394802fc5e9f24cab7b12c9d8c5..74522fee946857438152ac90b2283f7cabb81dca 100644
--- a/runtime/vm/json_stream.cc
+++ b/runtime/vm/json_stream.cc
@@ -327,7 +327,7 @@ void JSONStream::PrintValue(const Object& o, bool ref) {
 }
 
 
-void JSONStream::PrintValue(SourceBreakpoint* bpt) {
+void JSONStream::PrintValue(Breakpoint* bpt) {
   PrintCommaIfNeeded();
   bpt->PrintJSON(this);
 }
@@ -415,7 +415,7 @@ void JSONStream::PrintProperty(const char* name, const ServiceEvent* event) {
 }
 
 
-void JSONStream::PrintProperty(const char* name, SourceBreakpoint* bpt) {
+void JSONStream::PrintProperty(const char* name, Breakpoint* bpt) {
   PrintPropertyName(name);
   PrintValue(bpt);
 }