Revert "Removing reference to ObjectNotClosureException from dart2js."

tests/language/call_through_getter_test.dart

 // 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.
 
 // Tests that we can call functions through getters.
 
 const TOP_LEVEL_CONST = 1;
 const TOP_LEVEL_CONST_REF = TOP_LEVEL_CONST;
 const TOP_LEVEL_NULL = null;
 
@@ skipping 10 matching lines @@
   }
 
   static void testTopLevel() {
     topLevel = function() {
       return 2;
     };
     Expect.equals(1, TOP_LEVEL_CONST);
     Expect.equals(1, TOP_LEVEL_CONST_REF);
     Expect.equals(2, topLevel());
 
-    expectThrowsNoSuchMethod(() {
+    expectThrowsNotClosure(() {
       TOP_LEVEL_CONST(); /// static type warning
     });
-    expectThrowsNoSuchMethod(() {
+    expectThrowsNotClosure(() {
       (TOP_LEVEL_CONST)();  /// static type warning
     });
   }
 
   static void testField() {
     A a = new A();
     a.field = () => 42;
     Expect.equals(42, a.field());
     Expect.equals(42, (a.field)());
 
     a.field = () => 87;
     Expect.equals(87, a.field());
     Expect.equals(87, (a.field)());
 
     a.field = 99;
-    expectThrowsNoSuchMethod(() { a.field(); });
-    expectThrowsNoSuchMethod(() { (a.field)(); });
+    expectThrowsNotClosure(() { a.field(); });
+    expectThrowsNotClosure(() { (a.field)(); });
   }
 
   static void testGetter() {
     A a = new A();
     a.field = () => 42;
     Expect.equals(42, a.getter());
     Expect.equals(42, (a.getter)());
 
     a.field = () => 87;
     Expect.equals(87, a.getter());
     Expect.equals(87, (a.getter)());
 
     a.field = 99;
-    expectThrowsNoSuchMethod(() { a.getter(); });
-    expectThrowsNoSuchMethod(() { (a.getter)(); });
+    expectThrowsNotClosure(() { a.getter(); });
+    expectThrowsNotClosure(() { (a.getter)(); });
   }
 
   static void testMethod() {
     A a = new A();
     a.field = () => 42;
     Expect.equals(true, a.method() is Function);
     Expect.equals(42, a.method()());
 
     a.field = () => 87;
     Expect.equals(true, a.method() is Function);
@@ skipping 23 matching lines @@
     Expect.equals("xyzgf", b.g3(b.x, b.y, b.z));
     b = new B();
     Expect.equals("gxyzf", (b.g3)(b.x, b.y, b.z));
 
     b = new B();
     Expect.equals("yzxgf", b.g3(b.y, b.z, b.x));
     b = new B();
     Expect.equals("gyzxf", (b.g3)(b.y, b.z, b.x));
   }
 
-  static expectThrowsNoSuchMethod(fn) {
+  static void expectThrowsNotClosure(fn) {
     var exception = catchException(fn);
-    if (exception is! NoSuchMethodError) {
-      Expect.fail("Wrong exception.  Expected: NoSuchMethodError"
+    if (!(exception is ObjectNotClosureException)) {
+      Expect.fail("Wrong exception.  Expected: ObjectNotClosureException"
           " got: ${exception}");
     }
   }
 
   static catchException(fn) {
     bool caught = false;
     var result = null;
     try {
       fn();
       Expect.equals(true, false);  // Shouldn't reach this.
@@ skipping 32 matching lines @@
   get z { _mark('z'); return 2; }
 
   _mark(m) { _order.add(m); return _order.toString(); }
   StringBuffer _order;
 
 }
 
 main() {
   CallThroughGetterTest.testMain();
 }