Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Unified Diff: runtime/vm/unit_test.cc

Issue 10332257: Revert my last change. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/unit_test.h ('k') | tests/isolate/isolate.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/unit_test.cc
===================================================================
--- runtime/vm/unit_test.cc (revision 7756)
+++ runtime/vm/unit_test.cc (working copy)
@@ -48,7 +48,8 @@
static Dart_Handle LibraryTagHandler(Dart_LibraryTag tag,
Dart_Handle library,
- Dart_Handle url) {
+ Dart_Handle url,
+ Dart_Handle import_map) {
if (!Dart_IsLibrary(library)) {
return Dart_Error("not a library");
}
@@ -92,7 +93,8 @@
library,
url,
tag,
- url_chars);
+ url_chars,
+ import_map);
if (!Dart_IsError(result) && (tag == kImportTag)) {
Builtin::ImportLibrary(result, Builtin::kBuiltinLibrary);
}
@@ -107,9 +109,7 @@
Dart_Handle source = Dart_NewString(script);
Dart_Handle result = Dart_SetLibraryTagHandler(LibraryTagHandler);
EXPECT_VALID(result);
- result = Dart_SetImportMap(import_map);
- EXPECT_VALID(result);
- Dart_Handle lib = Dart_LoadScript(url, source);
+ Dart_Handle lib = Dart_LoadScript(url, source, import_map);
DART_CHECK_VALID(lib);
result = Dart_SetNativeResolver(lib, resolver);
DART_CHECK_VALID(result);
@@ -128,7 +128,8 @@
Dart_Handle TestCase::library_handler(Dart_LibraryTag tag,
Dart_Handle library,
- Dart_Handle url) {
+ Dart_Handle url,
+ Dart_Handle import_map) {
if (tag == kCanonicalizeUrl) {
return url;
}
« no previous file with comments | « runtime/vm/unit_test.h ('k') | tests/isolate/isolate.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698