Revert "Per-closure breakpoints; restructure breakpoint implementation to keep a list of conditions…

runtime/vm/json_stream.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/assert.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/json_stream.h"
 #include "vm/message.h"
@@ skipping 309 matching lines @@
   free(p);
 }
 
 
 void JSONStream::PrintValue(const Object& o, bool ref) {
   PrintCommaIfNeeded();
   o.PrintJSON(this, ref);
 }
 
 
-void JSONStream::PrintValue(Breakpoint* bpt) {
+void JSONStream::PrintValue(SourceBreakpoint* bpt) {
   PrintCommaIfNeeded();
   bpt->PrintJSON(this);
 }
 
 
 void JSONStream::PrintValue(const ServiceEvent* event) {
   PrintCommaIfNeeded();
   event->PrintJSON(this);
 }
 
@@ skipping 67 matching lines @@
   PrintValueNoEscape(s);
 }
 
 
 void JSONStream::PrintProperty(const char* name, const ServiceEvent* event) {
   PrintPropertyName(name);
   PrintValue(event);
 }
 
 
-void JSONStream::PrintProperty(const char* name, Breakpoint* bpt) {
+void JSONStream::PrintProperty(const char* name, SourceBreakpoint* bpt) {
   PrintPropertyName(name);
   PrintValue(bpt);
 }
 
 
 void JSONStream::PrintProperty(const char* name, Metric* metric) {
   PrintPropertyName(name);
   PrintValue(metric);
 }
 
@@ skipping 159 matching lines @@
   intptr_t len2 = OS::VSNPrint(p, len+1, format, args);
   va_end(args);
   ASSERT(len == len2);
   stream_->buffer_.AddChar('"');
   stream_->AddEscapedUTF8String(p);
   stream_->buffer_.AddChar('"');
   free(p);
 }
 
 }  // namespace dart