Revert two Kernel changes that were causing test failures.

tests/language_2/assertion_test.dart

Index: tests/language_2/assertion_test.dart
diff --git a/tests/language_2/assertion_test.dart b/tests/language_2/assertion_test.dart
deleted file mode 100644
index 462bd2457ab0527577bd688516e227d08765a25d..0000000000000000000000000000000000000000
--- a/tests/language_2/assertion_test.dart
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright (c) 2011, 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.
-// VMOptions=--enable_type_checks --enable_asserts
-
-// Dart test program testing assert statements.
-
-import "package:expect/expect.dart";
-
-testTrue() {
-  int i = 0;
-  try {
-    assert(true);
-  } on AssertionError catch (error) {
-    i = 1;
-  }
-  return i;
-}
-
-testFalse() {
-  int i = 0;
-  try {
-    assert(false);
-  } on AssertionError catch (error) {
-    i = 1;
-  }
-  return i;
-}
-
-unknown(dynamic a) {
-  return a ? true : false;
-}
-
-testClosureReturnsFalse() {
-  int i = 0;
-  try {
-    assert(() => false);
-  } on AssertionError catch (error) {
-    i = 1;
-  }
-  return i;
-}
-
-testClosure(bool f()) {
-  int i = 0;
-  try {
-    assert(f);
-  } on AssertionError catch (error) {
-    i = 1;
-  }
-  return i;
-}
-
-testBoolean(bool value) {
-  int i = 0;
-  try {
-    assert(value);
-  } on AssertionError catch (error) {
-    i = 1;
-  }
-  return i;
-}
-
-testDynamic(dynamic value) {
-  int i = 0;
-  try {
-    assert(value);
-  } on AssertionError catch (error) {
-    i = 1;
-  }
-  return i;
-}
-
-testMessage(value, message) {
-  try {
-    assert(value, message);
-    return null;
-  } on AssertionError catch (error) {
-    return error;
-  }
-}
-
-main() {
-  Expect.equals(0, testTrue());
-  Expect.equals(0, testBoolean(true));
-  Expect.equals(0, testDynamic(unknown(true)));
-  Expect.equals(0, testClosure(() => true));
-  Expect.equals(0, testDynamic(() => true));
-
-  Expect.equals(1, testFalse());
-  Expect.equals(1, testBoolean(false));
-  Expect.equals(1, testClosureReturnsFalse());
-  Expect.equals(1, testDynamic(unknown(false)));
-  Expect.equals(1, testDynamic(() => false));
-
-  Expect.equals(1, testBoolean(null));
-  Expect.equals(1, testDynamic(null));
-  Expect.equals(1, testDynamic(42));
-  Expect.equals(1, testDynamic(() => 42));
-  Expect.equals(1, testDynamic(() => null));
-  Expect.equals(1, testClosure(() => null));
-
-  Expect.equals(1234, testMessage(false, 1234).message);
-  Expect.equals('hi', testMessage(false, 'hi').message);
-  Expect.equals(1234, testMessage(() => false, 1234).message);
-  Expect.equals('hi', testMessage(() => false, 'hi').message);
-
-  // These errors do not have the message because boolean conversion failed.
-  Expect.equals(null, testMessage(null, 1234).message);
-  Expect.equals(null, testMessage(null, 'hi').message);
-  Expect.equals(null, testMessage(() => null, 1234).message);
-  Expect.equals(null, testMessage(() => null, 'hi').message);
-  Expect.isTrue("${testMessage(42, 1234)}".contains('boolean expression'));
-  Expect.isTrue("${testMessage(() => 1, 1234)}".contains('boolean expression'));
-}