Change how debugger handles source breakpoints

runtime/vm/service_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 "include/dart_debugger_api.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/globals.h"
 #include "vm/message_handler.h"
@@ skipping 121 matching lines @@
   isolate->debugger()->SetBreakpointAtLine(url, 3);
 
   // Get the breakpoint list.
   service_msg = Eval(lib, "[port, ['debug', 'breakpoints'], [], []]");
   Service::HandleServiceMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"type\":\"BreakpointList\",\"breakpoints\":[{"
           "\"type\":\"Breakpoint\",\"id\":1,\"enabled\":true,"
           "\"resolved\":false,"
-          "\"location\":{\"type\":\"Location\",\"libId\":12,"
+          "\"location\":{\"type\":\"Location\","
                         "\"script\":\"dart:test-lib\",\"tokenPos\":5}}]}",
       handler.msg());
 
   // Individual breakpoint.
   service_msg = Eval(lib, "[port, ['debug', 'breakpoints', '1'], [], []]");
   Service::HandleServiceMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"type\":\"Breakpoint\",\"id\":1,\"enabled\":true,"
        "\"resolved\":false,"
-       "\"location\":{\"type\":\"Location\",\"libId\":12,"
+       "\"location\":{\"type\":\"Location\","
                      "\"script\":\"dart:test-lib\",\"tokenPos\":5}}",
       handler.msg());
 
   // Missing sub-command.
   service_msg = Eval(lib, "[port, ['debug'], [], []]");
   Service::HandleServiceMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
       "{\"type\":\"Error\","
        "\"text\":\"Must specify a subcommand\","
@@ skipping 188 matching lines @@
   Service::HandleServiceMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
     "{\"type\":\"Error\",\"text\":\"Command too long\",\"message\":"
     "{\"arguments\":[\"classes\",\"1009\",\"functions\",\"9\",\"x\"],"
     "\"option_keys\":[],\"option_values\":[]}}",
     handler.msg());
 }
 
 }  // namespace dart