Revert r22847: some dart2dart tests fail.

tests/compiler/dart2js/mock_compiler.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.
 
 library mock_compiler;
 
 import "package:expect/expect.dart";
 import 'dart:collection';
 import 'dart:uri';
 
@@ skipping 154 matching lines @@
     DateTime(year);
     DateTime.utc(year);
   }
   abstract class Pattern {}
   bool identical(Object a, Object b) { return true; }''';
 
 const String DEFAULT_ISOLATE_HELPERLIB = r'''
   class _WorkerBase {}''';
 
 class MockCompiler extends Compiler {
-  api.DiagnosticHandler diagnosticHandler;
   List<WarningMessage> warnings;
   List<WarningMessage> errors;
   final Map<String, SourceFile> sourceFiles;
   Node parsedTree;
 
   MockCompiler({String coreSource: DEFAULT_CORELIB,
                 String helperSource: DEFAULT_HELPERLIB,
                 String interceptorsSource: DEFAULT_INTERCEPTORSLIB,
                 String isolateHelperSource: DEFAULT_ISOLATE_HELPERLIB,
                 bool enableTypeAssertions: false,
@@ skipping 63 matching lines @@
     parseScript(source, library);
     library.setExports(library.localScope.values.toList());
     registerSource(uri, source);
     libraries.putIfAbsent(uri.toString(), () => library);
     return library;
   }
 
   void reportWarning(Node node, var message) {
     if (message is! Message) message = message.message;
     warnings.add(new WarningMessage(node, message));
-    reportDiagnostic(spanFromNode(node),
-        'Warning: $message', api.Diagnostic.WARNING);
   }
 
   void reportError(Node node, var message) {
     if (message is String && message.startsWith("no library name found in")) {
       // TODO(ahe): Fix the MockCompiler to not have this problem.
       return;
     }
     if (message is! Message) message = message.message;
     errors.add(new WarningMessage(node, message));
-    reportDiagnostic(spanFromNode(node),
-        'Error: $message', api.Diagnostic.ERROR);
   }
 
   void reportMessage(SourceSpan span, var message, api.Diagnostic kind) {
     var diagnostic = new WarningMessage(null, message.message);
     if (kind == api.Diagnostic.ERROR) {
       errors.add(diagnostic);
     } else {
       warnings.add(diagnostic);
     }
-    reportDiagnostic(span, "$message", kind);
   }
 
-  void reportDiagnostic(SourceSpan span, String message, api.Diagnostic kind) {
-    if (diagnosticHandler != null) {
-      if (span != null) {
-        diagnosticHandler(span.uri, span.begin, span.end, message, kind);
-      } else {
-        diagnosticHandler(null, null, null, message, kind);
-      }
-    }
+  void reportDiagnostic(SourceSpan span, String message, var kind) {
+    print(message);
   }
 
   bool get compilationFailed => !errors.isEmpty;
 
   void clearWarnings() {
     warnings = [];
   }
 
   void clearErrors() {
     errors = [];
@@ skipping 21 matching lines @@
             mainApp.entryCompilationUnit);
     ResolverVisitor visitor =
         new ResolverVisitor(this, mockElement,
                             new CollectingTreeElements(mockElement));
     visitor.scope = new MethodScope(visitor.scope, mockElement);
     return visitor;
   }
 
   parseScript(String text, [LibraryElement library]) {
     if (library == null) library = mainApp;
-    parseUnit(text, this, library, registerSource);
+    parseUnit(text, this, library);
   }
 
   void scanBuiltinLibraries() {
     // Do nothing. The mock core library is already handled in the constructor.
   }
 
   LibraryElement scanBuiltinLibrary(String name) {
     // Do nothing. The mock core library is already handled in the constructor.
   }
 
@@ skipping 76 matching lines @@
   }
 }
 
 class MockDeferredLoadTask extends DeferredLoadTask {
   MockDeferredLoadTask(Compiler compiler) : super(compiler);
 
   void registerMainApp(LibraryElement mainApp) {
     // Do nothing.
   }
 }