Unify most of our utf8 implementations. This takes the implementation

runtime/bin/builtin.cc

Index: runtime/bin/builtin.cc
===================================================================
--- runtime/bin/builtin.cc	(revision 5167)
+++ runtime/bin/builtin.cc	(working copy)
@@ -33,8 +33,8 @@
     case kUriLibrary:
       source = Dart_NewString(Builtin::uri_source_);
       break;
-    case kUtf8Library:
-      source = Dart_NewString(Builtin::utf8_source_);
+    case kUtfLibrary:
+      source = Dart_NewString(Builtin::utf_source_);
       break;
     default:
       return Dart_Error("Unknown builtin source requested.");
@@ -44,7 +44,7 @@
 
 
 void Builtin::SetupLibrary(Dart_Handle library, BuiltinLibraryId id) {
-  if ((id == kJsonLibrary) || (id == kUriLibrary) || (id == kUtf8Library)) {
+  if ((id == kJsonLibrary) || (id == kUriLibrary) || (id == kUtfLibrary)) {
     // No native resolver for these pure Dart libraries.
     return;
   } else if (id == kBuiltinLibrary) {
@@ -73,8 +73,8 @@
     case kUriLibrary:
       url = Dart_NewString(DartUtils::kUriLibURL);
       break;
-    case kUtf8Library:
-      url = Dart_NewString(DartUtils::kUtf8LibURL);
+    case kUtfLibrary:
+      url = Dart_NewString(DartUtils::kUtfLibURL);
       break;
     default:
       return Dart_Error("Unknown builtin library requested.");