Refactorings for TranslateUri and its tests.

pkg/front_end/lib/src/base/processed_options.dart

 // Copyright (c) 2017, 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.
 
 import 'dart:async';
 
 import 'package:front_end/compilation_error.dart';
 import 'package:front_end/compiler_options.dart';
 import 'package:front_end/file_system.dart';
 import 'package:front_end/src/base/performace_logger.dart';
@@ skipping 203 matching lines @@
 
   /// Get the [TranslateUri] which resolves "package:" and "dart:" URIs.
   ///
   /// This is an asynchronous method since file system operations may be
   /// required to locate/read the packages file as well as SDK metadata.
   Future<TranslateUri> getUriTranslator() async {
     if (_uriTranslator == null) {
       await _getPackages();
       // TODO(scheglov) Load SDK libraries from whatever format we decide.
       // TODO(scheglov) Remove the field "_raw.dartLibraries".
-      var libraries = _raw.dartLibraries ?? await _parseLibraries();
+      var libraries = _raw.dartLibraries ?? await _parseDartLibraries();
       _uriTranslator =
-          new TranslateUri(_packages, libraries, const <String, List<Uri>>{});
+          new TranslateUri(libraries, const <String, List<Uri>>{}, _packages);
       ticker.logMs("Read packages file");
     }
     return _uriTranslator;
   }
 
-  Future<Map<String, Uri>> _parseLibraries() async {
+  Future<Map<String, Uri>> _parseDartLibraries() async {
     Uri librariesJson = _raw.sdkRoot?.resolve("lib/libraries.json");
-    return await computeLibraries(fileSystem, librariesJson);
+    return await computeDartLibraries(fileSystem, librariesJson);
   }
 
   /// Get the package map which maps package names to URIs.
   ///
   /// This is an asynchronous getter since file system operations may be
   /// required to locate/read the packages file.
   Future<Map<String, Uri>> _getPackages() async {
     if (_packages == null) {
       if (_raw.packagesFileUri == null) {
         // TODO(sigmund,paulberry): implement
@@ skipping 100 matching lines @@
 
 /// An error that only contains a message and no error location.
 class _CompilationError implements CompilationError {
   String get correction => null;
   SourceSpan get span => null;
   final String message;
   _CompilationError(this.message);
 
   String toString() => message;
 }