- reorganize DartUtils::PrepareForScriptLoading so that it does not have the wait for service load …

runtime/vm/unit_test.h

Index: runtime/vm/unit_test.h
diff --git a/runtime/vm/unit_test.h b/runtime/vm/unit_test.h
index 8e6267ee413e822832173d2298d2fb32960fb2ab..30e66c02defb837e85c9211d0b1a10f61f0219dd 100644
--- a/runtime/vm/unit_test.h
+++ b/runtime/vm/unit_test.h
@@ -7,6 +7,8 @@
 
 #include "include/dart_native_api.h"
 
+#include "bin/isolate_data.h"

[Cutch, 2016/02/03 23:16:17]

This feels icky but I see that unit_test.cc already #includes things from bin/

[siva, 2016/02/03 23:52:04]

I have moved the functions to the '.cc' files so that we don't have to add the
includes here. The '.cc' files already have bin

+
 #include "platform/globals.h"
 
 #include "vm/ast.h"
@@ -308,9 +310,10 @@ class TestCase : TestCaseBase {
  private:
   static Dart_Isolate CreateIsolate(const uint8_t* buffer,
                                     const char* name) {
+    bin::IsolateData* isolate_data = new bin::IsolateData(name, NULL, NULL);
     char* err;
     Dart_Isolate isolate = Dart_CreateIsolate(
-        name, NULL, buffer, NULL, NULL, &err);
+        name, NULL, buffer, NULL, isolate_data, &err);
     if (isolate == NULL) {
       OS::Print("Creation of isolate failed '%s'\n", err);
       free(err);