Revert "Per isolate package root."

runtime/lib/isolate.cc

Index: runtime/lib/isolate.cc
diff --git a/runtime/lib/isolate.cc b/runtime/lib/isolate.cc
index 82a0fc183b7c452bf0c8531bc913c5cd77a96323..f85726d1e02dc35b5a5fa8ee767d2f3ecb48bc7a 100644
--- a/runtime/lib/isolate.cc
+++ b/runtime/lib/isolate.cc
@@ -18,7 +18,6 @@
 #include "vm/resolver.h"
 #include "vm/snapshot.h"
 #include "vm/symbols.h"
-#include "vm/unicode.h"
 
 namespace dart {
 
@@ -154,7 +153,6 @@ static bool CreateIsolate(Isolate* parent_isolate,
   Isolate* child_isolate = reinterpret_cast<Isolate*>(
       (callback)(state->script_url(),
                  state->function_name(),
-                 state->package_root(),
                  init_data,
                  error));
   if (child_isolate == NULL) {
@@ -218,12 +216,11 @@ DEFINE_NATIVE_ENTRY(Isolate_spawnFunction, 3) {
 }
 
 
-DEFINE_NATIVE_ENTRY(Isolate_spawnUri, 5) {
+DEFINE_NATIVE_ENTRY(Isolate_spawnUri, 4) {
   GET_NON_NULL_NATIVE_ARGUMENT(SendPort, port, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(String, uri, arguments->NativeArgAt(1));
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, args, arguments->NativeArgAt(2));
   GET_NON_NULL_NATIVE_ARGUMENT(Instance, message, arguments->NativeArgAt(3));
-  GET_NATIVE_ARGUMENT(String, package_root, arguments->NativeArgAt(4));
 
   // Canonicalize the uri with respect to the current isolate.
   char* error = NULL;
@@ -236,17 +233,8 @@ DEFINE_NATIVE_ENTRY(Isolate_spawnUri, 5) {
     ThrowIsolateSpawnException(msg);
   }
 
-  char* utf8_package_root = NULL;
-  if (!package_root.IsNull()) {
-    const intptr_t len = Utf8::Length(package_root);
-    Zone* zone = isolate->current_zone();
-    utf8_package_root = zone->Alloc<char>(len + 1);
-    package_root.ToUTF8(reinterpret_cast<uint8_t*>(utf8_package_root), len);
-    utf8_package_root[len] = '\0';
-  }
-
-  return Spawn(isolate, new IsolateSpawnState(
-      port.Id(), canonical_uri, utf8_package_root, args, message));
+  return Spawn(isolate, new IsolateSpawnState(port.Id(), canonical_uri,
+                                              args, message));
 }