| Index: vm/custom_isolate_test.cc
|
| ===================================================================
|
| --- vm/custom_isolate_test.cc (revision 14046)
|
| +++ vm/custom_isolate_test.cc (working copy)
|
| @@ -179,10 +179,10 @@
|
|
|
| Dart_Handle recv_port = Dart_GetReceivePort(Dart_GetMainPortId());
|
| EXPECT_VALID(recv_port);
|
| - result = Dart_SetField(lib, Dart_NewString("mainPort"), recv_port);
|
| + result = Dart_SetField(lib, NewString("mainPort"), recv_port);
|
| EXPECT_VALID(result);
|
|
|
| - result = Dart_Invoke(lib, Dart_NewString(main_), 0, NULL);
|
| + result = Dart_Invoke(lib, NewString(main_), 0, NULL);
|
| EXPECT_VALID(result);
|
| free(const_cast<char*>(main_));
|
| main_ = NULL;
|
| @@ -234,7 +234,7 @@
|
| static Dart_NativeFunction NativeLookup(Dart_Handle name, int argc) {
|
| const char* name_str = NULL;
|
| EXPECT(Dart_IsString(name));
|
| - EXPECT_VALID(Dart_StringToCString(name, &name_str));
|
| + EXPECT_VALID(Dart_StringAsCString(name, &name_str));
|
| if (strcmp(name_str, "native_echo") == 0) {
|
| return &native_echo;
|
| } else if (strcmp(name_str, "CustomIsolateImpl_start") == 0) {
|
| @@ -251,7 +251,7 @@
|
| Dart_Handle toString = Dart_ToString(arg);
|
| EXPECT_VALID(toString);
|
| const char* c_str = NULL;
|
| - EXPECT_VALID(Dart_StringToCString(toString, &c_str));
|
| + EXPECT_VALID(Dart_StringAsCString(toString, &c_str));
|
| if (saved_echo) {
|
| free(const_cast<char*>(saved_echo));
|
| }
|
| @@ -272,7 +272,7 @@
|
| EXPECT_VALID(param);
|
| EXPECT(Dart_IsString(param));
|
| const char* isolate_main = NULL;
|
| - EXPECT_VALID(Dart_StringToCString(param, &isolate_main));
|
| + EXPECT_VALID(Dart_StringAsCString(param, &isolate_main));
|
| isolate_main = strdup(isolate_main);
|
|
|
| // Save current isolate.
|
| @@ -317,11 +317,11 @@
|
| EXPECT_VALID(lib);
|
|
|
| // Run main.
|
| - result = Dart_Invoke(lib, Dart_NewString("main"), 0, NULL);
|
| + result = Dart_Invoke(lib, NewString("main"), 0, NULL);
|
| EXPECT_VALID(result);
|
| EXPECT(Dart_IsString(result));
|
| const char* result_str = NULL;
|
| - EXPECT_VALID(Dart_StringToCString(result, &result_str));
|
| + EXPECT_VALID(Dart_StringAsCString(result, &result_str));
|
| EXPECT_STREQ("success", result_str);
|
|
|
| Dart_ExitScope();
|
|
|