- Refactor the isolate callback mechanism to also include creation of the

vm/dart_api_impl_test.cc

 // 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.
 
 #include "include/dart_api.h"
 
 #include "vm/assert.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
 #include "vm/unit_test.h"
 #include "vm/utils.h"
 #include "vm/verifier.h"
 
 namespace dart {
 
 
 #if defined(TARGET_ARCH_IA32)  // only ia32 can run execution tests.
 
 UNIT_TEST_CASE(ErrorHandles) {
   const char* kScriptChars =
       "class TestClass  {\n"
       "  static void testMain() {\n"
       "    throw new Exception(\"bad news\");\n"
       "  }\n"
       "}\n";
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
   Dart_Handle instance = Dart_True();
   Dart_Handle error = Api::Error("myerror");
   Dart_Handle exception = Dart_InvokeStatic(lib,
                                             Dart_NewString("TestClass"),
                                             Dart_NewString("testMain"),
                                             0,
                                             NULL);
@@ skipping 23 matching lines @@
   EXPECT_VALID(Dart_ErrorGetStacktrace(exception));
 
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 #endif
 
 
 UNIT_TEST_CASE(Dart_Error) {
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();
 
   Dart_Handle error = Dart_Error("An %s", "error");
   EXPECT(Dart_IsError(error));
   EXPECT_STREQ("An error", Dart_GetError(error));
 
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(Null) {
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
 
   Dart_Handle null = Dart_Null();
   EXPECT_VALID(null);
   EXPECT(Dart_IsNull(null));
 
   Dart_Handle str = Dart_NewString("test");
   EXPECT_VALID(str);
   EXPECT(!Dart_IsNull(str));
 
   Dart_ExitScope();  // Exit the Dart API scope.
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(IsSame) {
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
 
   bool same = false;
   Dart_Handle five = Dart_NewString("5");
   Dart_Handle five_again = Dart_NewString("5");
   Dart_Handle seven = Dart_NewString("7");
 
   // Same objects.
   EXPECT_VALID(Dart_IsSame(five, five, &same));
   EXPECT(same);
@@ skipping 22 matching lines @@
   }
 
   Dart_ExitScope();  // Exit the Dart API scope.
   Dart_ShutdownIsolate();
 }
 
 
 #if defined(TARGET_ARCH_IA32)  // only ia32 can run execution tests.
 
 UNIT_TEST_CASE(ObjectEquals) {
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
 
   bool equal = false;
   Dart_Handle five = Dart_NewString("5");
   Dart_Handle five_again = Dart_NewString("5");
   Dart_Handle seven = Dart_NewString("7");
 
   // Same objects.
   EXPECT_VALID(Dart_ObjectEquals(five, five, &equal));
   EXPECT(equal);
 
   // Equal objects.
   EXPECT_VALID(Dart_ObjectEquals(five, five_again, &equal));
   EXPECT(equal);
 
   // Different objects.
   EXPECT_VALID(Dart_ObjectEquals(five, seven, &equal));
   EXPECT(!equal);
 
   Dart_ExitScope();  // Exit the Dart API scope.
   Dart_ShutdownIsolate();
 }
 
 #endif
 
 UNIT_TEST_CASE(BooleanValues) {
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
 
   Dart_Handle str = Dart_NewString("test");
   EXPECT(!Dart_IsBoolean(str));
 
   bool value = false;
   Dart_Handle result = Dart_BooleanValue(str, &value);
   EXPECT(Dart_IsError(result));
 
   Dart_Handle val1 = Dart_NewBoolean(true);
   EXPECT(Dart_IsBoolean(val1));
 
   result = Dart_BooleanValue(val1, &value);
   EXPECT_VALID(result);
   EXPECT(value);
 
   Dart_Handle val2 = Dart_NewBoolean(false);
   EXPECT(Dart_IsBoolean(val2));
 
   result = Dart_BooleanValue(val2, &value);
   EXPECT_VALID(result);
   EXPECT(!value);
 
   Dart_ExitScope();  // Exit the Dart API scope.
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(BooleanConstants) {
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
 
   Dart_Handle true_handle = Dart_True();
   EXPECT_VALID(true_handle);
   EXPECT(Dart_IsBoolean(true_handle));
 
   bool value = false;
   Dart_Handle result = Dart_BooleanValue(true_handle, &value);
   EXPECT_VALID(result);
   EXPECT(value);
 
   Dart_Handle false_handle = Dart_False();
   EXPECT_VALID(false_handle);
   EXPECT(Dart_IsBoolean(false_handle));
 
   result = Dart_BooleanValue(false_handle, &value);
   EXPECT_VALID(result);
   EXPECT(!value);
 
   Dart_ExitScope();  // Exit the Dart API scope.
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(DoubleValues) {
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
 
   const double kDoubleVal1 = 201.29;
   const double kDoubleVal2 = 101.19;
   Dart_Handle val1 = Dart_NewDouble(kDoubleVal1);
   EXPECT(Dart_IsDouble(val1));
   Dart_Handle val2 = Dart_NewDouble(kDoubleVal2);
   EXPECT(Dart_IsDouble(val2));
   double out1, out2;
   Dart_Handle result = Dart_DoubleValue(val1, &out1);
@@ skipping 14 matching lines @@
   // TODO(antonm): add various kinds of ints (smi, mint, bigint).
   const char* kScriptChars =
       "class NumberValuesHelper {\n"
       "  static int getInt() { return 1; }\n"
       "  static double getDouble() { return 1.0; }\n"
       "  static bool getBool() { return false; }\n"
       "  static getNull() { return null; }\n"
       "}\n";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     Dart_Handle class_name = Dart_NewString("NumberValuesHelper");
     // Check int case.
     result = Dart_InvokeStatic(lib,
                                class_name,
@@ skipping 32 matching lines @@
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 #endif
 
 
 UNIT_TEST_CASE(IntegerValues) {
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
 
   const int64_t kIntegerVal1 = 100;
   const int64_t kIntegerVal2 = 0xffffffff;
   const char* kIntegerVal3 = "0x123456789123456789123456789";
 
   Dart_Handle val1 = Dart_NewInteger(kIntegerVal1);
   EXPECT(Dart_IsInteger(val1));
   bool fits = false;
   Dart_Handle result = Dart_IntegerFitsIntoInt64(val1, &fits);
@@ skipping 25 matching lines @@
   result = Dart_IntegerValueHexCString(val3, &chars);
   EXPECT_VALID(result);
   EXPECT(!strcmp(kIntegerVal3, chars));
 
   Dart_ExitScope();  // Exit the Dart API scope.
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(ArrayValues) {
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
 
   const int kArrayLength = 10;
   Dart_Handle str = Dart_NewString("test");
   EXPECT(!Dart_IsList(str));
   Dart_Handle val = Dart_NewList(kArrayLength);
   EXPECT(Dart_IsList(val));
   intptr_t len = 0;
   Dart_Handle result = Dart_ListLength(val, &len);
   EXPECT_VALID(result);
@@ skipping 21 matching lines @@
     EXPECT_VALID(result);
     EXPECT_EQ(i, value);
   }
 
   Dart_ExitScope();  // Exit the Dart API scope.
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(IsString) {
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
 
   uint8_t data8[] = { 'o', 'n', 'e', 0xFF };
 
   Dart_Handle str8 = Dart_NewString8(data8, ARRAY_SIZE(data8));
   EXPECT_VALID(str8);
   EXPECT(Dart_IsString(str8));
   EXPECT(Dart_IsString8(str8));
   EXPECT(Dart_IsString16(str8));
 
@@ skipping 48 matching lines @@
       "  static List testMain() {"
       "    List a = new List();"
       "    a.add(10);"
       "    a.add(20);"
       "    a.add(30);"
       "    return a;"
       "  }"
       "}";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object of type InstanceOf..
     result = Dart_InvokeStatic(lib,
                                Dart_NewString("ListAccessTest"),
                                Dart_NewString("testMain"),
@@ skipping 96 matching lines @@
   }
   Dart_ShutdownIsolate();
 }
 
 #endif  // TARGET_ARCH_IA32.
 
 
 // Unit test for entering a scope, creating a local handle and exiting
 // the scope.
 UNIT_TEST_CASE(EnterExitScope) {
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Isolate* isolate = Isolate::Current();
   EXPECT(isolate != NULL);
   ApiState* state = isolate->api_state();
   EXPECT(state != NULL);
   ApiLocalScope* scope = state->top_scope();
   Dart_EnterScope();
   {
     EXPECT(state->top_scope() != NULL);
     DARTSCOPE(isolate);
     const String& str1 = String::Handle(String::New("Test String"));
     Dart_Handle ref = Api::NewLocalHandle(str1);
     String& str2 = String::Handle();
     str2 ^= Api::UnwrapHandle(ref);
     EXPECT(str1.Equals(str2));
   }
   Dart_ExitScope();
   EXPECT(scope == state->top_scope());
   Dart_ShutdownIsolate();
 }
 
 
 // Unit test for creating and deleting persistent handles.
 UNIT_TEST_CASE(PersistentHandles) {
   const char* kTestString1 = "Test String1";
   const char* kTestString2 = "Test String2";
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Isolate* isolate = Isolate::Current();
   EXPECT(isolate != NULL);
   ApiState* state = isolate->api_state();
   EXPECT(state != NULL);
   ApiLocalScope* scope = state->top_scope();
   Dart_Handle handles[2000];
   Dart_EnterScope();
   {
     DARTSCOPE(isolate);
     const String& str1 = String::Handle(String::New(kTestString1));
@@ skipping 45 matching lines @@
   }
   EXPECT(scope == state->top_scope());
   EXPECT_EQ(2000, state->CountPersistentHandles());
   Dart_ShutdownIsolate();
 }
 
 
 // Test that we are able to create a persistent handle from a
 // persistent handle.
 UNIT_TEST_CASE(NewPersistentHandle_FromPersistentHandle) {
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
 
   Isolate* isolate = Isolate::Current();
   EXPECT(isolate != NULL);
   ApiState* state = isolate->api_state();
   EXPECT(state != NULL);
 
   // Start with a known persistent handle.
   Dart_Handle obj1 = Dart_True();
   EXPECT(state->IsValidPersistentHandle(obj1));
 
   // And use it to allocate a second persistent handle.
   Dart_Handle obj2 = Dart_NewPersistentHandle(obj1);
   EXPECT(state->IsValidPersistentHandle(obj2));
 
   // Make sure that the value transferred.
   EXPECT(Dart_IsBoolean(obj2));
   bool value = false;
   Dart_Handle result = Dart_BooleanValue(obj2, &value);
   EXPECT_VALID(result);
   EXPECT(value);
 
   Dart_ShutdownIsolate();
 }
 
 
 // Unit test for creating multiple scopes and local handles within them.
 // Ensure that the local handles get all cleaned out when exiting the
 // scope.
 UNIT_TEST_CASE(LocalHandles) {
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Isolate* isolate = Isolate::Current();
   EXPECT(isolate != NULL);
   ApiState* state = isolate->api_state();
   EXPECT(state != NULL);
   ApiLocalScope* scope = state->top_scope();
   Dart_Handle handles[300];
   {
     DARTSCOPE(isolate);
     Smi& val = Smi::Handle();
 
@@ skipping 46 matching lines @@
   EXPECT_EQ(0, state->CountLocalHandles());
   EXPECT(scope == state->top_scope());
   Dart_ShutdownIsolate();
 }
 
 
 // Unit test for creating multiple scopes and allocating objects in the
 // zone for the scope. Ensure that the memory is freed when the scope
 // exits.
 UNIT_TEST_CASE(LocalZoneMemory) {
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Isolate* isolate = Isolate::Current();
   EXPECT(isolate != NULL);
   ApiState* state = isolate->api_state();
   EXPECT(state != NULL);
   ApiLocalScope* scope = state->top_scope();
   {
     // Start a new scope and allocate some memory.
     Dart_EnterScope();
     for (int i = 0; i < 100; i++) {
       Api::Allocate(16);
@@ skipping 25 matching lines @@
   }
   EXPECT_EQ(0, state->ZoneSizeInBytes());
   EXPECT(scope == state->top_scope());
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(Isolates) {
   // This test currently assumes that the Dart_Isolate type is an opaque
   // representation of Isolate*.
-  Dart_Isolate iso_1 = Dart_CreateIsolate(NULL, NULL);
+  Dart_Isolate iso_1 = Dart_CreateIsolate(NULL);
   EXPECT_EQ(iso_1, Isolate::Current());
   Dart_Isolate isolate = Dart_CurrentIsolate();
   EXPECT_EQ(iso_1, isolate);
   Dart_ExitIsolate();
   EXPECT(NULL == Isolate::Current());
   EXPECT(NULL == Dart_CurrentIsolate());
-  Dart_Isolate iso_2 = Dart_CreateIsolate(NULL, NULL);
+  Dart_Isolate iso_2 = Dart_CreateIsolate(NULL);
   EXPECT_EQ(iso_2, Isolate::Current());
   Dart_ExitIsolate();
   EXPECT(NULL == Isolate::Current());
   Dart_EnterIsolate(iso_2);
   EXPECT_EQ(iso_2, Isolate::Current());
   Dart_ShutdownIsolate();
   EXPECT(NULL == Isolate::Current());
   Dart_EnterIsolate(iso_1);
   EXPECT_EQ(iso_1, Isolate::Current());
   Dart_ShutdownIsolate();
   EXPECT(NULL == Isolate::Current());
 }
 
 
 static bool MyPostMessageCallback(Dart_Isolate dest_isolate,
                                   Dart_Port send_port,
                                   Dart_Port reply_port,
                                   Dart_Message message) {
   return true;
 }
 
 
 static void MyClosePortCallback(Dart_Isolate dest_isolate,
                                 Dart_Port port) {
 }
 
 
 UNIT_TEST_CASE(SetMessageCallbacks) {
-  Dart_Isolate dart_isolate = Dart_CreateIsolate(NULL, NULL);
+  Dart_Isolate dart_isolate = Dart_CreateIsolate(NULL);
   Dart_SetMessageCallbacks(&MyPostMessageCallback, &MyClosePortCallback);
   Isolate* isolate = reinterpret_cast<Isolate*>(dart_isolate);
   EXPECT_EQ(&MyPostMessageCallback, isolate->post_message_callback());
   EXPECT_EQ(&MyClosePortCallback, isolate->close_port_callback());
   Dart_ShutdownIsolate();
 }
 
 
 #if defined(TARGET_ARCH_IA32)  // only ia32 can run execution tests.
 
 UNIT_TEST_CASE(FieldAccess) {
   const char* kScriptChars =
       "class Fields  {\n"
       "  Fields(int i, int j) : fld1 = i, fld2 = j {}\n"
       "  int fld1;\n"
       "  final int fld2;\n"
       "  static int fld3;\n"
       "  static final int fld4 = 10;\n"
       "}\n"
       "class FieldsTest {\n"
       "  static Fields testMain() {\n"
       "    Fields obj = new Fields(10, 20);\n"
       "    return obj;\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("FieldsTest"),
                                            Dart_NewString("testMain"),
@@ skipping 66 matching lines @@
       "  static final int _fld4 = 10;\n"
       "}\n"
       "class HiddenFieldsTest {\n"
       "  static HiddenFields testMain() {\n"
       "    HiddenFields obj = new HiddenFields(10, 20);\n"
       "    return obj;\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Load up a test script which extends the native wrapper class.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("HiddenFieldsTest"),
                                            Dart_NewString("testMain"),
@@ skipping 77 matching lines @@
       "  static final int fld4 = 10;\n"
       "}\n"
       "class NativeFieldsTest {\n"
       "  static NativeFields testMain() {\n"
       "    NativeFields obj = new NativeFields(10, 20);\n"
       "    return obj;\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
     const int kNumNativeFields = 4;
 
     // Create a test library.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars,
                                                native_field_lookup);
 
     // Create a native wrapper class with native fields.
     result = Dart_CreateNativeWrapperClass(
@@ skipping 40 matching lines @@
       "  static final int fld4 = 10;\n"
       "}\n"
       "class NativeFieldsTest {\n"
       "  static NativeFields testMain() {\n"
       "    NativeFields obj = new NativeFields(10, 20);\n"
       "    return obj;\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object of type NativeFields.
     result = Dart_InvokeStatic(lib,
                                Dart_NewString("NativeFieldsTest"),
                                Dart_NewString("testMain"),
@@ skipping 21 matching lines @@
       "  static final int fld4 = 10;\n"
       "}\n"
       "class NativeFieldsTest {\n"
       "  static NativeFields testMain() {\n"
       "    NativeFields obj = new NativeFields(10, 20);\n"
       "    return obj;\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
     const int kNumNativeFields = 2;
 
     // Load up a test script in the test library.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars,
                                                native_field_lookup);
 
     // Invoke a function which returns an object of type NativeFields.
     result = Dart_InvokeStatic(lib,
@@ skipping 33 matching lines @@
       "  static final int fld4 = 10;\n"
       "}\n"
       "class NativeFieldsTest {\n"
       "  static NativeFields testMain() {\n"
       "    NativeFields obj = new NativeFields(10, 20);\n"
       "    return obj;\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Load up a test script in the test library.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object of type NativeFields.
     result = Dart_InvokeStatic(lib,
                                Dart_NewString("NativeFieldsTest"),
                                Dart_NewString("testMain"),
@@ skipping 93 matching lines @@
       "  static final int fld4 = 10;\n"
       "}\n"
       "class NativeFieldsTest {\n"
       "  static NativeFields testMain() {\n"
       "    NativeFields obj = new NativeFields(10, 20);\n"
       "    return obj;\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
     const int kNumNativeFields = 4;
 
     // Create a test library.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars,
                                                native_field_lookup);
 
     // Create a native wrapper class with native fields.
     result = Dart_CreateNativeWrapperClass(
@@ skipping 29 matching lines @@
       "  final int fld2;\n"
       "  static int fld3;\n"
       "  static final int fld4 = 10;\n"
       "}\n"
       "class NativeFieldsTest {\n"
       "  static NativeFields testMain() {\n"
       "    NativeFields obj = new NativeFields(10, 20);\n"
       "    return obj;\n"
       "  }\n"
       "}\n";
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Load up a test script in the test library.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars,
                                                native_field_lookup);
 
     // Invoke a function which returns an object of type NativeFields.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("NativeFieldsTest"),
@@ skipping 24 matching lines @@
       "  static NativeFields testMain1() {\n"
       "    NativeFields obj = new NativeFields(10, 20);\n"
       "    return obj;\n"
       "  }\n"
       "  static Function testMain2() {\n"
       "    return function() {};\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     DARTSCOPE(Isolate::Current());
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object of type NativeFields.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("NativeFieldsTest"),
@@ skipping 57 matching lines @@
 UNIT_TEST_CASE(GetStaticField_RunsInitializer) {
   const char* kScriptChars =
       "class TestClass  {\n"
       "  static final int fld1 = 7;\n"
       "  static int fld2 = 11;\n"
       "  static void testMain() {\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object.
     result = Dart_InvokeStatic(lib,
                                Dart_NewString("TestClass"),
                                Dart_NewString("testMain"),
@@ skipping 34 matching lines @@
 
 
 UNIT_TEST_CASE(StaticFieldNotFound) {
   const char* kScriptChars =
       "class TestClass  {\n"
       "  static void testMain() {\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function.
     result = Dart_InvokeStatic(lib,
                                Dart_NewString("TestClass"),
                                Dart_NewString("testMain"),
@@ skipping 32 matching lines @@
       "  static final int fld4 = 10;\n"
       "}\n"
       "class InvokeDynamicTest {\n"
       "  static InvokeDynamic testMain() {\n"
       "    InvokeDynamic obj = new InvokeDynamic(10, 20);\n"
       "    return obj;\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     DARTSCOPE(Isolate::Current());
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object of type InvokeDynamic.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("InvokeDynamicTest"),
@@ skipping 48 matching lines @@
       "  static Function testMain1() {\n"
       "    InvokeClosure obj = new InvokeClosure(10, 20);\n"
       "    return obj.method1(10);\n"
       "  }\n"
       "  static Function testMain2() {\n"
       "    return InvokeClosure.method2(10);\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     DARTSCOPE(Isolate::Current());
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns a closure.
     Dart_Handle retobj = Dart_InvokeStatic(lib,
                                            Dart_NewString("InvokeClosureTest"),
@@ skipping 69 matching lines @@
       "  int fld1;\n"
       "}\n"
       "class ThrowExceptionTest {\n"
       "  static ThrowException testMain() {\n"
       "    ThrowException obj = new ThrowException(10);\n"
       "    return obj;\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Isolate* isolate = Isolate::Current();
   EXPECT(isolate != NULL);
   ApiState* state = isolate->api_state();
   EXPECT(state != NULL);
   {
     intptr_t size = state->ZoneSizeInBytes();
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Load up a test script which extends the native wrapper class.
     Dart_Handle lib = TestCase::LoadTestScript(
@@ skipping 47 matching lines @@
       "class MyObject {"
       "  int method1(int i, int j) native 'Name_Does_Not_Matter';"
       "}"
       "class Test {"
       "  static testMain() {"
       "    MyObject obj = new MyObject();"
       "    return obj.method1(77, 125);"
       "  }"
       "}";
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();
     Dart_Handle lib = TestCase::LoadTestScript(
         kScriptChars,
         reinterpret_cast<Dart_NativeEntryResolver>(gnac_lookup));
 
     Dart_Handle result = Dart_InvokeStatic(lib,
                                            Dart_NewString("Test"),
                                            Dart_NewString("testMain"),
                                            0,
@@ skipping 10 matching lines @@
   }
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(GetClass) {
   const char* kScriptChars =
       "class DoesExist {"
       "}";
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
   // Lookup a class that does exist.
   Dart_Handle cls = Dart_GetClass(lib, Dart_NewString("DoesExist"));
   EXPECT_VALID(cls);
 
   // Lookup a class that does not exist.
   cls = Dart_GetClass(lib, Dart_NewString("DoesNotExist"));
   EXPECT(Dart_IsError(cls));
@@ skipping 11 matching lines @@
       "  static returnNull() { return null; }\n"
       "}\n"
       "class InstanceOfTest {\n"
       "  InstanceOfTest() {}\n"
       "  static InstanceOfTest testMain() {\n"
       "    return new InstanceOfTest();\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Invoke a function which returns an object of type InstanceOf..
     Dart_Handle instanceOfTestObj =
         Dart_InvokeStatic(lib,
                           Dart_NewString("InstanceOfTest"),
@@ skipping 51 matching lines @@
     result = Dart_ObjectIsType(null, null, &is_instance);
     EXPECT(Dart_IsError(result));
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(NullReceiver) {
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();  // Enter a Dart API scope for the unit test.
   {
     DARTSCOPE(Isolate::Current());
 
     Dart_Handle function_name = Dart_NewString("toString");
     const int number_of_arguments = 0;
     Dart_Handle null_receiver = Api::NewLocalHandle(Object::Handle());
     Dart_Handle result = Dart_InvokeDynamic(null_receiver,
                                             function_name,
                                             number_of_arguments,
@@ skipping 25 matching lines @@
   return Api::Success();
 }
 
 
 UNIT_TEST_CASE(LoadScript) {
   const char* kScriptChars =
       "main() {"
       "  return 12345;"
       "}";
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();
 
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   Dart_Handle error = Dart_Error("incoming error");
   Dart_Handle result;
 
   result = Dart_LoadScript(Dart_Null(), source, library_handler);
   EXPECT(Dart_IsError(result));
   EXPECT_STREQ("Dart_LoadScript expects argument 'url' to be non-null.",
@@ skipping 47 matching lines @@
 
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(LoadScript_CompileError) {
   const char* kScriptChars =
       ")";
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();
 
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   Dart_Handle result = Dart_LoadScript(url, source, library_handler);
   EXPECT(Dart_IsError(result));
   EXPECT(strstr(Dart_GetError(result), "unexpected token ')'"));
 
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(LookupLibrary) {
   const char* kScriptChars =
       "#import('library1.dart');"
       "main() {}";
   const char* kLibrary1Chars =
       "#library('library1.dart');"
       "#import('library2.dart');";
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();
 
   // Create a test library and Load up a test script in it.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   Dart_Handle result = Dart_LoadScript(url, source, library_handler);
   EXPECT_VALID(result);
 
   url = Dart_NewString("library1.dart");
   source = Dart_NewString(kLibrary1Chars);
@@ skipping 26 matching lines @@
 
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(LibraryUrl) {
   const char* kLibrary1Chars =
       "#library('library1_name');";
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();
 
   Dart_Handle url = Dart_NewString("library1_url");
   Dart_Handle source = Dart_NewString(kLibrary1Chars);
   Dart_Handle lib = Dart_LoadLibrary(url, source);
   Dart_Handle error = Dart_Error("incoming error");
   EXPECT_VALID(lib);
 
   Dart_Handle result = Dart_LibraryUrl(Dart_Null());
   EXPECT(Dart_IsError(result));
@@ skipping 21 matching lines @@
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(LibraryImportLibrary) {
   const char* kLibrary1Chars =
       "#library('library1_name');";
   const char* kLibrary2Chars =
       "#library('library2_name');";
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();
 
   Dart_Handle error = Dart_Error("incoming error");
   Dart_Handle result;
 
   Dart_Handle url = Dart_NewString("library1_url");
   Dart_Handle source = Dart_NewString(kLibrary1Chars);
   Dart_Handle lib1 = Dart_LoadLibrary(url, source);
   EXPECT_VALID(lib1);
 
@@ skipping 40 matching lines @@
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 
 
 UNIT_TEST_CASE(LoadLibrary) {
   const char* kLibrary1Chars =
       "#library('library1_name');";
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();
 
   Dart_Handle error = Dart_Error("incoming error");
   Dart_Handle result;
 
   Dart_Handle url = Dart_NewString("library1_url");
   Dart_Handle source = Dart_NewString(kLibrary1Chars);
 
   result = Dart_LoadLibrary(Dart_Null(), source);
   EXPECT(Dart_IsError(result));
@@ skipping 39 matching lines @@
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(LoadLibrary_CompileError) {
   const char* kLibrary1Chars =
       "#library('library1_name');"
       ")";
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();
 
   Dart_Handle url = Dart_NewString("library1_url");
   Dart_Handle source = Dart_NewString(kLibrary1Chars);
   Dart_Handle result = Dart_LoadLibrary(url, source);
   EXPECT(Dart_IsError(result));
   EXPECT(strstr(Dart_GetError(result), "unexpected token ')'"));
 
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 
 UNIT_TEST_CASE(LoadSource) {
   const char* kLibrary1Chars =
       "#library('library1_name');";
   const char* kSourceChars =
       "// Something innocuous";
   const char* kBadSourceChars =
       ")";
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();
 
   Dart_Handle error = Dart_Error("incoming error");
   Dart_Handle result;
 
   // Load up a library.
   Dart_Handle url = Dart_NewString("library1_url");
   Dart_Handle source = Dart_NewString(kLibrary1Chars);
   Dart_Handle lib = Dart_LoadLibrary(url, source);
   EXPECT_VALID(lib);
@@ skipping 99 matching lines @@
 
 
 UNIT_TEST_CASE(SetNativeResolver) {
   const char* kScriptChars =
       "class Test {"
       "  static foo() native \"SomeNativeFunction\";"
       "  static bar() native \"SomeNativeFunction2\";"
       "  static baz() native \"SomeNativeFunction3\";"
       "}";
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   Dart_EnterScope();
 
   Dart_Handle error = Dart_Error("incoming error");
   Dart_Handle result;
 
   // Load a test script.
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(kScriptChars);
   Dart_Handle lib = Dart_LoadScript(url, source, library_handler);
   EXPECT_VALID(lib);
@@ skipping 84 matching lines @@
       "main() {}";
   const char* kLibrary1Chars =
       "#library('library1.dart');"
       "#import('library2.dart');"
       "var foo1;";
   const char* kLibrary2Chars =
       "#library('library2.dart');"
       "var foo;";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle url = Dart_NewString(TestCase::url());
     Dart_Handle source = Dart_NewString(kScriptChars);
     result = Dart_LoadScript(url, source, library_handler);
 
     url = Dart_NewString("library1.dart");
     source = Dart_NewString(kLibrary1Chars);
@@ skipping 27 matching lines @@
   const char* kLibrary1Chars =
       "#library('library1.dart');"
       "#import('library2.dart');"
       "var foo1;";
   const char* kLibrary2Chars =
       "#library('library2.dart');"
       "#import('library1.dart');"
       "var foo;";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle url = Dart_NewString(TestCase::url());
     Dart_Handle source = Dart_NewString(kScriptChars);
     result = Dart_LoadScript(url, source, library_handler);
 
     url = Dart_NewString("library1.dart");
     source = Dart_NewString(kLibrary1Chars);
@@ skipping 23 matching lines @@
       "var foo_top = 10;  // foo has dup def. So should be an error."
       "main() {}";
   const char* kLibrary1Chars =
       "#library('library1.dart');"
       "var foo;";
   const char* kLibrary2Chars =
       "#library('library2.dart');"
       "var foo;";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle url = Dart_NewString(TestCase::url());
     Dart_Handle source = Dart_NewString(kScriptChars);
     result = Dart_LoadScript(url, source, library_handler);
 
     url = Dart_NewString("library2.dart");
     source = Dart_NewString(kLibrary2Chars);
@@ skipping 45 matching lines @@
   const char* kLibraryEChars =
       "#library('libraryE.dart');"
       "#import('libraryC.dart');"
       "#import('libraryF.dart');"
       "var fooE = 10;  //fooC has duplicate def. so should be an error.";
   const char* kLibraryFChars =
       "#library('libraryF.dart');"
       "var fooC;";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle url = Dart_NewString(TestCase::url());
     Dart_Handle source = Dart_NewString(kScriptChars);
     result = Dart_LoadScript(url, source, library_handler);
 
     url = Dart_NewString("libraryA.dart");
     source = Dart_NewString(kLibraryAChars);
@@ skipping 42 matching lines @@
       "  void set handler(void callback(List<int> x));"
       "}"
       "void main() {}";
   const char* kLibraryChars =
       "#library('lib.dart');"
       "interface X {"
       "  void set handler(void callback(List<int> x));"
       "}";
   Dart_Handle result;
 
-  Dart_CreateIsolate(NULL, NULL);
+  Dart_CreateIsolate(NULL);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Create a test library and Load up a test script in it.
     Dart_Handle url = Dart_NewString(TestCase::url());
     Dart_Handle source = Dart_NewString(kScriptChars);
     result = Dart_LoadScript(url, source, library_handler);
 
     url = Dart_NewString("lib.dart");
     source = Dart_NewString(kLibraryChars);
     Dart_LoadLibrary(url, source);
 
     result = Dart_InvokeStatic(result,
                                Dart_NewString(""),
                                Dart_NewString("main"),
                                0,
                                NULL);
     EXPECT_VALID(result);
 
     Dart_ExitScope();  // Exit the Dart API scope.
   }
   Dart_ShutdownIsolate();
 }
 #endif  // TARGET_ARCH_IA32.
 
 }  // namespace dart