Fix merge bug.

tools/testing/dart/test_suite.dart

Index: tools/testing/dart/test_suite.dart
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
index 828ce94bfb61dabf5baa0a46caf2d7bd2acf9d42..db00fd683db0e906ad9b347fb248ad8f660c3ca2 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -1046,11 +1046,10 @@ class StandardTestSuite extends TestSuite {
         break;
 
       case Compiler.dartdevc:
-        var toPath = new Path('$compilationTempDir/$nameNoExt.js')
-            .toNativePath();
-        commands.add(configuration.compilerConfiguration.createCommand(
-            dartWrapperFilename, toPath,
-            optionsFromFile["sharedOptions"] as List<String>));
+        var toPath =
+            new Path('$compilationTempDir/$nameNoExt.js').toNativePath();
+        commands.add(configuration.compilerConfiguration.createCommand(fileName,
+            toPath, optionsFromFile["sharedOptions"] as List<String>));
         break;
 
       default:
@@ -1071,7 +1070,8 @@ class StandardTestSuite extends TestSuite {
 
         case Compiler.dartdevc:
           commands.add(configuration.compilerConfiguration.createCommand(
-              fromPath.toNativePath(), toPath,
+              fromPath.toNativePath(),
+              toPath,
               optionsFromFile["sharedOptions"] as List<String>));
           break;
       }