Repeats and fixes the changes landed & reverted as CL 1789553003.

tests/compiler/dart2js/analyze_helper.dart

-// Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2016, 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 analyze_helper;
 
 import 'dart:async';
 import 'dart:io';
 import 'package:compiler/compiler.dart' as api;
-import 'package:compiler/compiler_new.dart' as new_api;
 import 'package:compiler/src/apiimpl.dart';
 import 'package:compiler/src/commandline_options.dart';
 import 'package:compiler/src/diagnostics/messages.dart' show
     Message,
     MessageKind;
 import 'package:compiler/src/filenames.dart';
+import 'package:compiler/src/options.dart' show
+    CompilerOptions;
 import 'package:compiler/src/source_file_provider.dart';
 import 'package:compiler/src/util/uri_extras.dart';
 
 /// Option for hiding whitelisted messages.
 const String HIDE_WHITELISTED = '--hide-whitelisted';
 
 /**
  * Map of whitelisted warnings and errors.
  *
  * Only add a whitelisting together with a bug report to dartbug.com and add
@@ skipping 192 matching lines @@
   if (options.contains(Flags.verbose)) {
     handler.verbose = true;
   }
   if (options.contains(HIDE_WHITELISTED)) {
     handler.showWhitelisted = false;
   }
   var compiler = new CompilerImpl(
       provider,
       null,
       handler,
-      new new_api.CompilerOptions.parse(
+      new CompilerOptions.parse(
           libraryRoot: libraryRoot,
           packageRoot: packageRoot,
           options: options,
           environment: {}));
   String MESSAGE = """
 
 
 ===
 === ERROR: Unexpected result of analysis.
 ===
@@ skipping 19 matching lines @@
   if (checkResults != null) {
     result = checkResults(compiler, handler);
   } else {
     result = handler.checkResults();
   }
   if (!result) {
     print(MESSAGE);
     exit(1);
   }
 }