[dart2dart] Make removal of asserts and forcing type strips go under

tests/compiler/dart2js/unparser_test.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.
 
 #import('dart:uri');
 #import('parser_helper.dart');
 #import('mock_compiler.dart');
 #import("../../../lib/compiler/compiler.dart");
 #import("../../../lib/compiler/implementation/leg.dart", prefix:'leg');
 #import("../../../lib/compiler/implementation/dart_backend/dart_backend.dart");
@@ skipping 31 matching lines @@
 ''';
 
 const ioLib = r'''
 #library('io');
 class Platform {
   static int operatingSystem;
 }
 ''';
 
 testDart2Dart(String src, [void continuation(String s), bool minify = false,
-    bool cutDeclarationTypes = false]) {
+    bool stripTypes = false]) {
   // If continuation is not provided, check that source string remains the same.
   if (continuation === null) {
     continuation = (s) { Expect.equals(src, s); };
   }
-  testDart2DartWithLibrary(src, '', continuation, minify, cutDeclarationTypes);
+  testDart2DartWithLibrary(src, '', continuation, minify, stripTypes);
 }
 
 /**
  * Library name is assumed to be 'mylib' in 'mylib.dart' file.
  */
 testDart2DartWithLibrary(
     String srcMain, String srcLibrary,
     [void continuation(String s), bool minify = false,
-    bool cutDeclarationTypes = false]) {
+    bool stripTypes = false]) {
   fileUri(path) => new Uri.fromComponents(scheme: 'file', path: path);
 
   final scriptUri = fileUri('script.dart');
   final libUri = fileUri('mylib.dart');
 
   provider(uri) {
     if (uri == scriptUri) return new Future.immediate(srcMain);
     if (uri.toString() == libUri.toString()) {
       return new Future.immediate(srcLibrary);
     }
     if (uri.path.endsWith('/core.dart')) return new Future.immediate(coreLib);
     if (uri.path.endsWith('/io.dart')) return new Future.immediate(ioLib);
     return new Future.immediate('');
   }
 
   handler(uri, begin, end, message, kind) {
     if (kind === Diagnostic.ERROR || kind === Diagnostic.CRASH) {
       Expect.fail('$uri: $begin-$end: $message [$kind]');
     }
   }
 
   final options = <String>['--output-type=dart'];
   if (minify) options.add('--minify');
-  if (cutDeclarationTypes) options.add('--force-cut-declaration-types');
+  if (stripTypes) options.add('--force-strip=types');
 
   compile(
       scriptUri,
       fileUri('libraryRoot'),
       fileUri('packageRoot'),
       provider,
       handler,
       options).then(continuation);
 }
 
@@ skipping 701 matching lines @@
 
 main() {
   String localvar;
   foo("5");
 }
 ''';
   var expectedResult =
       ' foo( arg){}main(){var localvar;foo("5");}';
   testDart2Dart(src,
       (String result) { Expect.equals(expectedResult, result); },
-      cutDeclarationTypes: true);
+      stripTypes: true);
 }
 
 main() {
   testSignedConstants();
   testGenericTypes();
   testForLoop();
   testEmptyList();
   testClosure();
   testIndexedOperatorDecl();
   testNativeMethods();
@@ skipping 25 matching lines @@
   testDoubleMains();
   testInterfaceDefaultAnotherLib();
   testStaticAccessIoLib();
   testLocalFunctionPlaceholder();
   testMinification();
   testClosureLocalsMinified();
   testParametersMinified();
   testTypeVariablesInDifferentLibraries();
   testDeclarationTypePlaceholders();
 }