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

runtime/vm/unit_test.h

 // Copyright (c) 2011, 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.
 
 #ifndef VM_UNIT_TEST_H_
 #define VM_UNIT_TEST_H_
 
 #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"
 #include "vm/dart.h"
 #include "vm/globals.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
 #include "vm/longjump.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
@@ skipping 281 matching lines @@
   static Dart_Handle library_handler(Dart_LibraryTag tag,
                                      Dart_Handle library,
                                      Dart_Handle url);
   static char* BigintToHexValue(Dart_CObject* bigint);
 
   virtual void Run();
 
  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);
     }
     EXPECT(isolate != NULL);
     return isolate;
   }
 
   RunEntry* const run_;
 };
@@ skipping 246 matching lines @@
 // Yields:
 //
 //    out = "\"id\":\"\""
 //
 void ElideJSONSubstring(const char* prefix, const char* in, char* out);
 
 
 }  // namespace dart
 
 #endif  // VM_UNIT_TEST_H_