Various clean up.

dart/tests/try/poi/apply_updates_test.dart

 // Copyright (c) 2014, 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.
 
 // Test of FunctionUpdate by pretty printing the updated element before and
 // after.
 library trydart.library_updater_test;
 
 import 'dart:convert' show
     UTF8;
@@ skipping 14 matching lines @@
 class ApplyUpdateTestCase extends LibraryUpdaterTestCase {
   final String expectedUpdate;
 
   ApplyUpdateTestCase(
       {String before,
       String after,
       String update})
       : this.expectedUpdate = update,
         super(before: before, after: after, canReuse: true);
 
-  Future run() => mainApp.then((LibraryElement library) {
+  Future run() => loadMainApp().then((LibraryElement library) {
     // Capture the current version of [before] before invoking the [updater].
     PartialFunctionElement before = library.localLookup(expectedUpdate);
     var beforeNode = before.parseNode(compiler);
 
     LibraryUpdater updater =
         new LibraryUpdater(this.compiler, null, scriptUri, nolog, nolog);
     bool actualCanReuse =
         updater.canReuseLibrary(library, UTF8.encode(newSource));
     Expect.equals(expectedCanReuse, actualCanReuse);
 
@@ skipping 43 matching lines @@
 
           new ApplyUpdateTestCase(
               before: 'main(){}',
               after: 'main()=>null;',
               update: 'main'),
 
           // TODO(ahe): When supporting class members, test abstract methods.
       ]
   );
 }