Change Library service protocol ids

runtime/vm/object_service.cc

 // Copyright (c) 2016, 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/debugger.h"
 #include "vm/disassembler.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
@@ skipping 430 matching lines @@
 void Script::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   AddCommonObjectProperties(&jsobj, "Script", ref);
   const String& uri = String::Handle(url());
   ASSERT(!uri.IsNull());
   const char* encoded_uri = String::EncodeIRI(uri);
   const Library& lib = Library::Handle(FindLibrary());
   if (lib.IsNull()) {
     jsobj.AddServiceId(*this);
   } else {
-    jsobj.AddFixedServiceId("libraries/%" Pd "/scripts/%s/%" Px64 "",
-                            lib.index(), encoded_uri, load_timestamp());
+    const String& lib_id = String::Handle(lib.private_key());
+    jsobj.AddFixedServiceId("libraries/%s/scripts/%s/%" Px64 "",
+                            lib_id.ToCString(), encoded_uri, load_timestamp());
   }
   jsobj.AddPropertyStr("uri", uri);
   jsobj.AddProperty("_kind", GetKindAsCString());
   if (ref) {
     return;
   }
   jsobj.AddPropertyTimeMillis("_loadTime", load_timestamp());
   if (!lib.IsNull()) {
     jsobj.AddProperty("library", lib);
   }
@@ skipping 29 matching lines @@
         }
         const Smi& smi = Smi::Cast(value);
         lineInfo.AddValue(smi.Value());
       }
     }
   }
 }
 
 
 void Library::PrintJSONImpl(JSONStream* stream, bool ref) const {
-  intptr_t id = index();
-  ASSERT(id >= 0);
+  const String& id = String::Handle(private_key());
   JSONObject jsobj(stream);
   AddCommonObjectProperties(&jsobj, "Library", ref);
-  jsobj.AddFixedServiceId("libraries/%" Pd "", id);
+  jsobj.AddFixedServiceId("libraries/%s", id.ToCString());
   const String& vm_name = String::Handle(name());
   const String& scrubbed_name = String::Handle(String::ScrubName(vm_name));
   AddNameProperties(&jsobj, scrubbed_name.ToCString(), vm_name.ToCString());
   const String& library_url = String::Handle(url());
   jsobj.AddPropertyStr("uri", library_url);
   if (ref) {
     return;
   }
   jsobj.AddProperty("debuggable", IsDebuggable());
   {
@@ skipping 1033 matching lines @@
   jsobj.AddProperty("mirrorReferent", referent_handle);
 }
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 #endif
 
 }  // namespace dart