Change Library service protocol ids

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/dart_api_message.h"
 #include "vm/debugger.h"
 #include "vm/message.h"
 #include "vm/unit_test.h"
 
@@ skipping 35 matching lines @@
       "  x.add('won');\n"
       "  x.add('too');\n"
       "  return x.toString();\n"
       "}\n";
   SetFlagScope<bool> sfs(&FLAG_remove_script_timestamps_for_test, true);
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT_VALID(lib);
   Library& vmlib = Library::Handle();
   vmlib ^= Api::UnwrapHandle(lib);
   EXPECT(!vmlib.IsNull());
+  const String& private_key = String::Handle(vmlib.private_key());
 
   Isolate* isolate = Isolate::Current();
   Debugger* debugger = isolate->debugger();
 
   // Empty case.
   {
     JSONStream js;
     {
       JSONArray jsarr(&js);
       debugger->PrintBreakpointsToJSONArray(&jsarr);
@@ skipping 10 matching lines @@
     {
       JSONArray jsarr(&js);
       debugger->PrintBreakpointsToJSONArray(&jsarr);
     }
     ExpectSubstringF(
         js.ToCString(),
         "[{\"type\":\"Breakpoint\",\"fixedId\":true,\"id\":\"breakpoints\\/2\","
         "\"breakpointNumber\":2,\"resolved\":false,"
         "\"location\":{\"type\":\"UnresolvedSourceLocation\","
         "\"script\":{\"type\":\"@Script\",\"fixedId\":true,"
-        "\"id\":\"libraries\\/%" Pd
+        "\"id\":\"libraries\\/%s"
         "\\/scripts\\/test-lib\\/0\","
         "\"uri\":\"test-lib\","
         "\"_kind\":\"script\"},\"line\":3}},"
         "{\"type\":\"Breakpoint\",\"fixedId\":true,\"id\":\"breakpoints\\/1\","
         "\"breakpointNumber\":1,\"resolved\":false,"
         "\"location\":{\"type\":\"UnresolvedSourceLocation\","
         "\"script\":{\"type\":\"@Script\",\"fixedId\":true,"
-        "\"id\":\"libraries\\/%" Pd
+        "\"id\":\"libraries\\/%s"
         "\\/scripts\\/test-lib\\/0\","
         "\"uri\":\"test-lib\","
         "\"_kind\":\"script\"},\"line\":2}}]",
-        vmlib.index(), vmlib.index());
+        private_key.ToCString(), private_key.ToCString());
   }
 }
 
 
 static bool saw_paused_event = false;
 
 static void InspectPausedEvent(Dart_IsolateId isolate_id,
                                intptr_t bp_id,
                                const Dart_CodeLocation& loc) {
   Isolate* isolate = Isolate::Current();
@@ skipping 322 matching lines @@
       "enter(bar1) enter(bar2) enter(bar3) enter(foo) "
       "enter(bar3) enter(foo) "
       "exit(foo) exit(bar3) exit(bar2) exit(bar1) ",
       result_cstr);
   EXPECT(saw_paused_event);
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart