Support column-based breakpoints in the VM and Observatory.

runtime/vm/debugger_test.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 "vm/dart_api_impl.h"
 #include "vm/debugger.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
@@ skipping 51 matching lines @@
   {
     JSONStream js;
     {
       JSONArray jsarr(&js);
       debugger->PrintBreakpointsToJSONArray(&jsarr);
     }
     ExpectSubstringF(
         js.ToCString(),
         "[{\"type\":\"Breakpoint\",\"fixedId\":true,\"id\":\"breakpoints\\/2\","
         "\"breakpointNumber\":2,\"resolved\":false,"
-        "\"location\":{\"type\":\"SourceLocation\","
+        "\"location\":{\"type\":\"UnresolvedSourceLocation\","
         "\"script\":{\"type\":\"@Script\",\"fixedId\":true,"
         "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
         "\"uri\":\"test-lib\","
-        "\"_kind\":\"script\"},\"tokenPos\":14}},"
+        "\"_kind\":\"script\"},\"line\":3}},"
         "{\"type\":\"Breakpoint\",\"fixedId\":true,\"id\":\"breakpoints\\/1\","
         "\"breakpointNumber\":1,\"resolved\":false,"
-        "\"location\":{\"type\":\"SourceLocation\","
+        "\"location\":{\"type\":\"UnresolvedSourceLocation\","
         "\"script\":{\"type\":\"@Script\",\"fixedId\":true,"
         "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
         "\"uri\":\"test-lib\","
-        "\"_kind\":\"script\"},\"tokenPos\":5}}]",
+        "\"_kind\":\"script\"},\"line\":2}}]",
         vmlib.index(), vmlib.index());
   }
 }
 
 
 static bool saw_paused_event = false;
 
 static void InspectPausedEvent(Dart_IsolateId isolate_id,
                                intptr_t bp_id,
                                const Dart_CodeLocation& loc) {
@@ skipping 35 matching lines @@
   debugger->SetBreakpointAtLine(url, 2);
   Dart_Handle result = Dart_Invoke(lib, NewString("main"), 0, NULL);
   EXPECT_VALID(result);
   EXPECT(Dart_IsString(result));
 
   // We ran the code in InspectPausedEvent.
   EXPECT(saw_paused_event);
 }
 
 }  // namespace dart