Change Library service protocol ids

runtime/vm/service.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/service.h"
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 #include "platform/globals.h"
 
@@ skipping 1497 matching lines @@
 static RawObject* LookupHeapObjectLibraries(Isolate* isolate,
                                             char** parts,
                                             int num_parts) {
   // Library ids look like "libraries/35"
   if (num_parts < 2) {
     return Object::sentinel().raw();
   }
   const GrowableObjectArray& libs =
       GrowableObjectArray::Handle(isolate->object_store()->libraries());
   ASSERT(!libs.IsNull());
-  intptr_t id = 0;
-  if (!GetIntegerId(parts[1], &id)) {
+  const String& id = String::Handle(String::New(parts[1]));
+  // Scan for private key.
+  String& private_key = String::Handle();
+  Library& lib = Library::Handle();
+  bool lib_found = false;
+  for (intptr_t i = 0; i < libs.Length(); i++) {
+    lib ^= libs.At(i);
+    ASSERT(!lib.IsNull());
+    private_key ^= lib.private_key();
+    if (private_key.Equals(id)) {
+      lib_found = true;
+      break;
+    }
+  }
+  if (!lib_found) {
     return Object::sentinel().raw();
   }
-  if ((id < 0) || (id >= libs.Length())) {
-    return Object::sentinel().raw();
-  }
-  Library& lib = Library::Handle();
-  lib ^= libs.At(id);
-  ASSERT(!lib.IsNull());
   if (num_parts == 2) {
     return lib.raw();
   }
   if (strcmp(parts[2], "scripts") == 0) {
     // Script ids look like "libraries/35/scripts/library%2Furl.dart/12345"
     if (num_parts != 5) {
       return Object::sentinel().raw();
     }
     const String& id = String::Handle(String::New(parts[3]));
     ASSERT(!id.IsNull());
@@ skipping 2606 matching lines @@
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart