Various clean up.

dart/tests/try/web/incremental_compilation_update_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.
 
 library trydart.incremental_compilation_update_test;
 
 import 'dart:html' hide
     Element;
 
 import 'dart:async' show
@@ skipping 1137 matching lines @@
 class SerializeScopeTestCase extends CompilerTestCase {
   final String scopeInfo;
 
   SerializeScopeTestCase(
       String source,
       LibraryElement library,
       Compiler compiler)
       : scopeInfo = computeScopeInfo(compiler, library),
         super(source, '${library.canonicalUri}');
 
-  Future run() => mainApp.then(checkScopes);
+  Future run() => loadMainApp().then(checkScopes);
 
   void checkScopes(LibraryElement library) {
     Expect.stringEquals(computeScopeInfo(compiler, library), scopeInfo);
   }
 
   static String computeScopeInfo(Compiler compiler, LibraryElement library) {
     ScopeInformationVisitor visitor =
         new ScopeInformationVisitor(compiler, library, 0);
 
     visitor.ignoreImports = true;
@@ skipping 66 matching lines @@
   position: absolute;
   left: 0px;
   width: 3em;
   text-align: right;
   background-color: lightgoldenrodyellow;
 }
 ''');
   style.type = 'text/css';
   return style;
 }