Refactorings for TranslateUri and its tests.

pkg/front_end/test/fasta/testing/suite.dart

 // 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.md file.
 
 library fasta.testing.suite;
 
 import 'dart:async' show Future;
 
 import 'dart:io' show File;
 
@@ skipping 216 matching lines @@
       TestDescription description, FastaContext context) async {
     // Disable colors to ensure that expectation files are the same across
     // platforms and independent of stdin/stderr.
     CompilerContext.current.disableColors();
     Program platformOutline = await context.loadPlatformOutline();
     Ticker ticker = new Ticker();
     DillTarget dillTarget = new DillTarget(ticker, context.uriTranslator,
         new TestVmFastaTarget(new TargetFlags(strongMode: strongMode)));
     platformOutline.unbindCanonicalNames();
     dillTarget.loader.appendLibraries(platformOutline);
-    // We create a new URI translator to avoid reading plaform libraries from
+    // We create a new URI translator to avoid reading platform libraries from
     // file system.
-    TranslateUri uriTranslator = new TranslateUri(
-        context.uriTranslator.packages,
-        const <String, Uri>{},
-        const <String, List<Uri>>{});
+    TranslateUri uriTranslator = new TranslateUri(const <String, Uri>{},
+        const <String, List<Uri>>{}, context.uriTranslator.packages);
     KernelTarget sourceTarget = astKind == AstKind.Analyzer
         ? new AnalyzerTarget(dillTarget, uriTranslator, strongMode)
         : new KernelTarget(
             PhysicalFileSystem.instance, dillTarget, uriTranslator);
 
     Program p;
     try {
       sourceTarget.read(description.uri);
       await dillTarget.buildOutlines();
       ValidatingInstrumentation instrumentation;
@@ skipping 61 matching lines @@
     }
   }
 
   void performGlobalTransformations(CoreTypes coreTypes, Program program,
       {void logger(String msg)}) {
     if (enabled) {
       super.performGlobalTransformations(coreTypes, program, logger: logger);
     }
   }
 }