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

pkg/compiler/lib/src/mirrors/analyze.dart

 // 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.
 
 library dart2js.source_mirrors.analyze;
 
 import 'dart:async';
 
 import 'source_mirrors.dart';
 import 'dart2js_mirrors.dart' show Dart2JsMirrorSystem;
 import '../../compiler.dart' as api;
-import '../../compiler_new.dart' as new_api;
+import '../options.dart' show CompilerOptions;
 import '../apiimpl.dart' as apiimpl;
 import '../compiler.dart' show Compiler;
 import '../old_to_new_api.dart';
 
 //------------------------------------------------------------------------------
 // Analysis entry point.
 //------------------------------------------------------------------------------
 
 /**
  * Analyzes set of libraries and provides a mirror system which can be used for
@@ skipping 29 matching lines @@
         kind == api.Diagnostic.CRASH) {
       compilationFailed = true;
     }
     diagnosticHandler(uri, begin, end, message, kind);
   }
 
   Compiler compiler = new apiimpl.CompilerImpl(
       new LegacyCompilerInput(inputProvider),
       new LegacyCompilerOutput(),
       new LegacyCompilerDiagnostics(internalDiagnosticHandler),
-      new new_api.CompilerOptions.parse(
+      new CompilerOptions.parse(
           libraryRoot: libraryRoot,
           packageRoot: packageRoot,
           options: options,
           environment: const {},
           packageConfig: packageConfig,
           packagesDiscoveryProvider: findPackages));
   compiler.librariesToAnalyzeWhenRun = libraries;
   return compiler.run(null).then((bool success) {
     if (success && !compilationFailed) {
       return new Dart2JsMirrorSystem(compiler);
     } else {
       throw new StateError('Failed to create mirror system.');
     }
   });
 }