Revert "Move dart2jslib parts into separate libraries."

tests/compiler/dart2js/memory_compiler.dart

Index: tests/compiler/dart2js/memory_compiler.dart
diff --git a/tests/compiler/dart2js/memory_compiler.dart b/tests/compiler/dart2js/memory_compiler.dart
index a48f8282d96ee51d82a46537e3d9108a172d7bca..4d3c8930d2ba06e6c4037599438f839b0d0586e0 100644
--- a/tests/compiler/dart2js/memory_compiler.dart
+++ b/tests/compiler/dart2js/memory_compiler.dart
@@ -4,26 +4,32 @@
 
 library dart2js.test.memory_compiler;
 
-import 'dart:async';
+import 'memory_source_file_helper.dart';
+
+
+import 'package:compiler/src/null_compiler_output.dart' show
+    NullCompilerOutput;
+
+import 'package:compiler/src/dart2jslib.dart' show
+    Message;
 
 import 'package:compiler/compiler.dart' show
     DiagnosticHandler;
+
 import 'package:compiler/compiler_new.dart' show
     CompilationResult,
     CompilerDiagnostics,
     CompilerOutput,
     Diagnostic,
     PackagesDiscoveryProvider;
-import 'package:compiler/src/messages.dart' show
-    Message;
+
+import 'dart:async';
+
 import 'package:compiler/src/mirrors/source_mirrors.dart';
 import 'package:compiler/src/mirrors/analyze.dart';
-import 'package:compiler/src/null_compiler_output.dart' show
-    NullCompilerOutput;
-import 'package:compiler/src/library_loader.dart' show
-    LoadedLibraries;
 
-import 'memory_source_file_helper.dart';
+import 'package:compiler/src/library_loader.dart'
+    show LoadedLibraries;
 
 export 'output_collector.dart';
 export 'package:compiler/compiler_new.dart' show