Revert "Use a single file for app snapshots."

tools/testing/dart/runtime_configuration.dart

Index: tools/testing/dart/runtime_configuration.dart
diff --git a/tools/testing/dart/runtime_configuration.dart b/tools/testing/dart/runtime_configuration.dart
index a56614864c1b74f806089573367e6c496748b9af..8983cc5949d04f30da138b57a4c8853d740dfb85 100644
--- a/tools/testing/dart/runtime_configuration.dart
+++ b/tools/testing/dart/runtime_configuration.dart
@@ -4,8 +4,6 @@
 
 library runtime_configuration;
 
-import 'dart:io' show Platform;
-
 import 'compiler_configuration.dart' show CommandArtifact;
 
 // TODO(ahe): Remove this import, we can precompute all the values required
@@ -246,14 +244,16 @@ class DartAppRuntimeConfiguration extends DartVmRuntimeConfiguration {
       throw "dart_app cannot run files of type '$type'.";
     }
 
-    var args = new List();
-    args.addAll(arguments);
-    args.removeLast();
-    args.add("${artifact.filename}/out.jitsnapshot");
+    var augmentedArgs = new List();
+    augmentedArgs.add("--run-app-snapshot=${artifact.filename}");
+    if (useBlobs) {
+      augmentedArgs.add("--use-blobs");
+    }
+    augmentedArgs.addAll(arguments);
 
     return <Command>[
       commandBuilder.getVmCommand(suite.dartVmBinaryFileName,
-          args, environmentOverrides)
+          augmentedArgs, environmentOverrides)
     ];
   }
 }
@@ -274,14 +274,16 @@ class DartPrecompiledRuntimeConfiguration extends DartVmRuntimeConfiguration {
       throw "dart_precompiled cannot run files of type '$type'.";
     }
 
-    var args = new List();
-    args.addAll(arguments);
-    args.removeLast();
-    args.add("${artifact.filename}/out.aotsnapshot");
+    var augmentedArgs = new List();
+    augmentedArgs.add("--run-app-snapshot=${artifact.filename}");
+    if (useBlobs) {
+      augmentedArgs.add("--use-blobs");
+    }
+    augmentedArgs.addAll(arguments);
 
     return <Command>[
       commandBuilder.getVmCommand(suite.dartPrecompiledBinaryFileName,
-          args, environmentOverrides)
+          augmentedArgs, environmentOverrides)
     ];
   }
 }