Simplify the builtin functions and get rid of unused code.

bin/gen_snapshot.cc

 // Copyright (c) 2012, 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.
 
 // Generate a snapshot file after loading all the scripts specified on the
 // command line.
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ skipping 179 matching lines @@
 static Dart_Handle LoadGenericSnapshotCreationScript(
     Builtin::BuiltinLibraryId id) {
   Dart_Handle source = Builtin::Source(id);
   if (Dart_IsError(source)) {
     return source;  // source contains the error string.
   }
   Dart_Handle lib;
   // Load the builtin library to make it available in the snapshot
   // for importing.
   lib = Builtin::LoadAndCheckLibrary(id);
-  if (!Dart_IsError(lib)) {
-    Builtin::SetupLibrary(lib, id);
-  }
+  ASSERT(!Dart_IsError(lib));
   return lib;
 }
 
 
 static void PrintUsage() {
   fprintf(stderr,
           "dart [<vm-flags>] "
           "[<dart-script-file>]\n");
 }
 
@@ skipping 40 matching lines @@
   if (Dart_IsError(result)) {
     fprintf(stderr, "%s", Dart_GetError(result));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     exit(255);
   }
   // This is a generic dart snapshot which needs builtin library setup.
   Dart_Handle library =
       LoadGenericSnapshotCreationScript(Builtin::kBuiltinLibrary);
   VerifyLoaded(library);
+  library = LoadGenericSnapshotCreationScript(Builtin::kJsonLibrary);
+  VerifyLoaded(library);
+  library = LoadGenericSnapshotCreationScript(Builtin::kUriLibrary);
+  VerifyLoaded(library);
   library = LoadGenericSnapshotCreationScript(Builtin::kCryptoLibrary);
   VerifyLoaded(library);
   library = LoadGenericSnapshotCreationScript(Builtin::kIOLibrary);
   VerifyLoaded(library);
-  library = LoadGenericSnapshotCreationScript(Builtin::kJsonLibrary);
-  VerifyLoaded(library);
-  library = LoadGenericSnapshotCreationScript(Builtin::kUriLibrary);
-  VerifyLoaded(library);
   library = LoadGenericSnapshotCreationScript(Builtin::kUtfLibrary);
   VerifyLoaded(library);
 }
 
 
 int main(int argc, char** argv) {
   CommandLineOptions vm_options(argc);
 
   // Initialize the URL mapping array.
   CommandLineOptions url_mapping_array(argc);
@@ skipping 102 matching lines @@
 
       // Now create and write snapshot of script.
       CreateAndWriteSnapshot(true);
     }
   } else {
     SetupForGenericSnapshotCreation();
     CreateAndWriteSnapshot(false);
   }
   return 0;
 }