Update imports to use package:compiler and package:try.

R=floitsch@google.com, johnniwinther@google.com

Review URL: https://codereview.chromium.org//341923005

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@37538 260f80e4-7a28-3924-810f-c04153c831b5

pkg/docgen/lib/src/exports/dart2js_mirrors.dart

@@ -4,4 +4,4 @@
 
 library docgen.exports.dart2js_mirrors;
 
-export '../../../../../sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirrors.dart';
+export 'package:compiler/implementation/mirrors/dart2js_mirrors.dart';

pkg/docgen/lib/src/exports/mirrors_util.dart

@@ -4,4 +4,4 @@
 
 library docgen.exports.mirrors_util;
 
-export '../../../../../sdk/lib/_internal/compiler/implementation/mirrors/mirrors_util.dart';
+export 'package:compiler/implementation/mirrors/mirrors_util.dart';

pkg/docgen/lib/src/exports/source_mirrors.dart

@@ -4,5 +4,5 @@
 
 library docgen.exports.source_mirrors;
 
-export '../../../../../sdk/lib/_internal/compiler/implementation/mirrors/source_mirrors.dart'
+export 'package:compiler/implementation/mirrors/source_mirrors.dart'
     hide SourceLocation;

pkg/docgen/lib/src/generator.dart

@@ -12,11 +12,11 @@ import 'dart:io';
 import 'package:markdown/markdown.dart' as markdown;
 import 'package:path/path.dart' as path;
 
-import '../../../../sdk/lib/_internal/compiler/compiler.dart' as api;
-import '../../../../sdk/lib/_internal/compiler/implementation/filenames.dart';
-import '../../../../sdk/lib/_internal/compiler/implementation/mirrors/analyze.dart'
+import 'package:compiler/compiler.dart' as api;
+import 'package:compiler/implementation/filenames.dart';
+import 'package:compiler/implementation/mirrors/analyze.dart'
     as dart2js;
-import '../../../../sdk/lib/_internal/compiler/implementation/source_file_provider.dart';
+import 'package:compiler/implementation/source_file_provider.dart';
 
 import 'exports/dart2js_mirrors.dart' as dart2js_mirrors;
 import 'exports/libraries.dart';

pkg/docgen/lib/src/models/annotation.dart

@@ -14,7 +14,7 @@ import 'library.dart';
 import 'mirror_based.dart';
 
 import 'dart:mirrors';
-import '../../../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart';
+import 'package:compiler/implementation/tree/tree.dart';
 
 /// Holds the name of the annotation, and its parameters.
 class Annotation extends MirrorBased<ClassMirror> {

tests/compiler/dart2js/analyze_dart2js_test.dart

@@ -5,7 +5,7 @@
 library analyze_dart2js;
 
 import "package:expect/expect.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/filenames.dart';
+import 'package:compiler/implementation/filenames.dart';
 import 'analyze_helper.dart';
 import "package:async_helper/async_helper.dart";
 

tests/compiler/dart2js/analyze_helper.dart

@@ -6,13 +6,13 @@ library analyze_helper;
 
 import 'dart:async';
 import 'dart:io';
-import '../../../sdk/lib/_internal/compiler/compiler.dart' as api;
-import '../../../sdk/lib/_internal/compiler/implementation/apiimpl.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/compiler.dart' as api;
+import 'package:compiler/implementation/apiimpl.dart';
+import 'package:compiler/implementation/dart2jslib.dart'
     hide Compiler;
-import '../../../sdk/lib/_internal/compiler/implementation/filenames.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/source_file_provider.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/util/uri_extras.dart';
+import 'package:compiler/implementation/filenames.dart';
+import 'package:compiler/implementation/source_file_provider.dart';
+import 'package:compiler/implementation/util/uri_extras.dart';
 
 /**
  * Map of whitelisted warnings and errors.

tests/compiler/dart2js/analyze_only_test.dart

@@ -10,7 +10,7 @@ import 'dart:async';
 import "package:async_helper/async_helper.dart";
 
 import '../../utils/dummy_compiler_test.dart' as dummy;
-import '../../../sdk/lib/_internal/compiler/compiler.dart';
+import 'package:compiler/compiler.dart';
 
 runCompiler(String main, List<String> options,
             onValue(String code, List errors, List warnings)) {

tests/compiler/dart2js/analyze_unused_dart2js_test.dart

@@ -6,8 +6,8 @@ library analyze_unused_dart2js;
 
 import 'package:async_helper/async_helper.dart';
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/filenames.dart';
+import 'package:compiler/implementation/dart2jslib.dart';
+import 'package:compiler/implementation/filenames.dart';
 
 import 'analyze_helper.dart';
 

tests/compiler/dart2js/async_compiler_input_provider_test.dart

@@ -8,8 +8,8 @@ import "dart:io";
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
 
-import '../../../sdk/lib/_internal/compiler/compiler.dart' as compiler;
-import '../../../sdk/lib/_internal/compiler/implementation/filenames.dart';
+import 'package:compiler/compiler.dart' as compiler;
+import 'package:compiler/implementation/filenames.dart';
 
 const SOURCES = const {
   "/main.dart": """

tests/compiler/dart2js/bad_loop_test.dart

@@ -6,7 +6,7 @@ import 'package:expect/expect.dart';
 import 'memory_source_file_helper.dart';
 import "package:async_helper/async_helper.dart";
 
-import '../../../sdk/lib/_internal/compiler/compiler.dart'
+import 'package:compiler/compiler.dart'
        show Diagnostic;
 
 main() {

tests/compiler/dart2js/bad_output_io_test.dart

@@ -9,11 +9,11 @@ library dart2js.test.missing_file;
 import 'dart:io' show exit;
 import 'package:expect/expect.dart';
 
-import '../../../sdk/lib/_internal/compiler/compiler.dart'
+import 'package:compiler/compiler.dart'
        show Diagnostic;
-import '../../../sdk/lib/_internal/compiler/implementation/dart2js.dart'
+import 'package:compiler/implementation/dart2js.dart'
        show exitFunc, compileFunc, compile, diagnosticHandler;
-import '../../../sdk/lib/_internal/compiler/implementation/source_file_provider.dart'
+import 'package:compiler/implementation/source_file_provider.dart'
        show FormattingDiagnosticHandler;
 
 class CollectingFormattingDiagnosticHandler

tests/compiler/dart2js/begin_end_token_test.dart

@@ -4,7 +4,7 @@
 
 import "package:expect/expect.dart";
 import 'parser_helper.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart';
+import 'package:compiler/implementation/tree/tree.dart';
 
 void testNode(Node node, String expected, String text, [bool hard = true]) {
   var debug = 'text=$text,expected=$expected,node:${node}';

tests/compiler/dart2js/call_site_simple_type_inferer_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/types/types.dart'
+import 'package:compiler/implementation/types/types.dart'
     show TypeMask;
 
 import 'compiler_helper.dart';

tests/compiler/dart2js/command_line_split_test.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "package:expect/expect.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/util/command_line.dart';
+import 'package:compiler/implementation/util/command_line.dart';
 
 main() {
   Expect.listEquals(["foo", "bar"], splitLine("foo bar"));

tests/compiler/dart2js/compiler_helper.dart

@@ -8,16 +8,16 @@ library compiler_helper;
 import 'dart:async';
 import "package:expect/expect.dart";
 
-import '../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart'
+import 'package:compiler/implementation/elements/elements.dart'
        as lego;
-export '../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart';
+export 'package:compiler/implementation/elements/elements.dart';
 
-import '../../../sdk/lib/_internal/compiler/implementation/js_backend/js_backend.dart'
+import 'package:compiler/implementation/js_backend/js_backend.dart'
        as js;
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
        as leg;
-export '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+export 'package:compiler/implementation/dart2jslib.dart'
        show Constant,
             Message,
             MessageKind,
@@ -25,22 +25,22 @@ export '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
             TypedSelector,
             SourceSpan;
 
-import '../../../sdk/lib/_internal/compiler/implementation/ssa/ssa.dart' as ssa;
+import 'package:compiler/implementation/ssa/ssa.dart' as ssa;
 
-import '../../../sdk/lib/_internal/compiler/implementation/types/types.dart'
+import 'package:compiler/implementation/types/types.dart'
        as types;
-export '../../../sdk/lib/_internal/compiler/implementation/types/types.dart'
+export 'package:compiler/implementation/types/types.dart'
        show TypeMask;
 
-import '../../../sdk/lib/_internal/compiler/implementation/util/util.dart';
-export '../../../sdk/lib/_internal/compiler/implementation/util/util.dart';
+import 'package:compiler/implementation/util/util.dart';
+export 'package:compiler/implementation/util/util.dart';
 
-import '../../../sdk/lib/_internal/compiler/implementation/source_file.dart';
+import 'package:compiler/implementation/source_file.dart';
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
        show Compiler;
 
-export '../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart';
+export 'package:compiler/implementation/tree/tree.dart';
 
 import 'mock_compiler.dart';
 export 'mock_compiler.dart';

tests/compiler/dart2js/compiler_test.dart

@@ -5,10 +5,10 @@
 import "dart:async";
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/resolution/resolution.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/util/util.dart";
+import "package:compiler/implementation/dart2jslib.dart";
+import "package:compiler/implementation/elements/elements.dart";
+import "package:compiler/implementation/resolution/resolution.dart";
+import "package:compiler/implementation/util/util.dart";
 import "mock_compiler.dart";
 
 

tests/compiler/dart2js/cpa_inference_test.dart

@@ -5,9 +5,9 @@
 import 'dart:async';
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/source_file.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/types/types.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/inferrer/concrete_types_inferrer.dart';
+import 'package:compiler/implementation/source_file.dart';
+import 'package:compiler/implementation/types/types.dart';
+import 'package:compiler/implementation/inferrer/concrete_types_inferrer.dart';
 
 import "parser_helper.dart";
 import "compiler_helper.dart";

tests/compiler/dart2js/dart_backend_test.dart

@@ -6,11 +6,11 @@ import "package:expect/expect.dart";
 import 'dart:async';
 import "package:async_helper/async_helper.dart";
 import 'mock_compiler.dart';
-import '../../../sdk/lib/_internal/compiler/compiler.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart' as leg;
-import '../../../sdk/lib/_internal/compiler/implementation/dart_backend/dart_backend.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart';
+import 'package:compiler/compiler.dart';
+import 'package:compiler/implementation/dart2jslib.dart' as leg;
+import 'package:compiler/implementation/dart_backend/dart_backend.dart';
+import 'package:compiler/implementation/elements/elements.dart';
+import 'package:compiler/implementation/tree/tree.dart';
 
 const coreLib = r'''
 library corelib;

tests/compiler/dart2js/dart_printer_test.dart

@@ -5,15 +5,15 @@
 library dart_printer_test;
 
 import "package:expect/expect.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/dart_backend/dart_printer.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/scanner/scannerlib.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/source_file.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart' show DartString;
+import 'package:compiler/implementation/dart_backend/dart_printer.dart';
+import 'package:compiler/implementation/scanner/scannerlib.dart';
+import 'package:compiler/implementation/source_file.dart';
+import 'package:compiler/implementation/dart2jslib.dart';
+import 'package:compiler/implementation/tree/tree.dart' show DartString;
 import 'dart:mirrors';
-import '../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart' as tree;
-import '../../../sdk/lib/_internal/compiler/implementation/string_validator.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart_backend/dart_tree_printer.dart' show TreePrinter;
+import 'package:compiler/implementation/tree/tree.dart' as tree;
+import 'package:compiler/implementation/string_validator.dart';
+import 'package:compiler/implementation/dart_backend/dart_tree_printer.dart' show TreePrinter;
 
 /// For debugging the [AstBuilder] stack. Prints information about [x].
 void show(x) {

tests/compiler/dart2js/deferred_dont_inline_deferred_constants_test.dart

@@ -10,7 +10,7 @@ import "package:async_helper/async_helper.dart";
 import 'memory_source_file_helper.dart';
 import "dart:async";
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
        as dart2js;
 
 class MemoryOutputSink extends EventSink<String> {

tests/compiler/dart2js/deferred_emit_type_checks_test.dart

@@ -10,7 +10,7 @@ import "package:async_helper/async_helper.dart";
 import 'memory_source_file_helper.dart';
 import "dart:async";
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
        as dart2js;
 
 class MemoryOutputSink<T> extends EventSink<T> {

tests/compiler/dart2js/deferred_follow_constant_dependencies_test.dart

@@ -8,7 +8,7 @@ import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'memory_source_file_helper.dart';
 import "dart:async";
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
   hide Compiler;
 
 

tests/compiler/dart2js/deferred_follow_implicit_super_regression_test.dart

@@ -8,7 +8,7 @@ import 'memory_source_file_helper.dart';
 import "memory_compiler.dart";
 import "dart:async";
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
        as dart2js;
 
 runTest(String mainScript, test) {

tests/compiler/dart2js/deferred_load_graph_segmentation2_test.dart

@@ -11,7 +11,7 @@ import "package:async_helper/async_helper.dart";
 import 'memory_source_file_helper.dart';
 import "dart:async";
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
        as dart2js;
 
 class FakeOutputStream<T> extends EventSink<T> {

tests/compiler/dart2js/deferred_load_graph_segmentation_test.dart

@@ -11,7 +11,7 @@ import "package:async_helper/async_helper.dart";
 import 'memory_source_file_helper.dart';
 import "dart:async";
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
        as dart2js;
 
 class FakeOutputStream<T> extends EventSink<T> {

tests/compiler/dart2js/deferred_mirrors_test.dart

@@ -11,7 +11,7 @@ import "package:async_helper/async_helper.dart";
 import 'memory_source_file_helper.dart';
 import "memory_compiler.dart";
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
        as dart2js;
 
 runTest(String mainScript, test) {

tests/compiler/dart2js/deferred_not_in_main_test.dart

@@ -11,7 +11,7 @@ import "package:async_helper/async_helper.dart";
 import 'memory_source_file_helper.dart';
 import "dart:async";
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
        as dart2js;
 
 class FakeOutputStream<T> extends EventSink<T> {

tests/compiler/dart2js/diagnose_ambiguous_test.dart

@@ -6,7 +6,7 @@ import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'memory_source_file_helper.dart';
 
-import '../../../sdk/lib/_internal/compiler/compiler.dart'
+import 'package:compiler/compiler.dart'
        show Diagnostic;
 
 main() {

tests/compiler/dart2js/dump_info_test.dart

@@ -6,7 +6,7 @@
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
 import 'memory_compiler.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dump_info.dart';
+import 'package:compiler/implementation/dump_info.dart';
 
 const String TEST_ONE = r"""
 library main;

tests/compiler/dart2js/erroneous_element_test.dart

@@ -3,13 +3,13 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "package:expect/expect.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart';
+import 'package:compiler/implementation/elements/elements.dart';
 import 'parser_helper.dart';
 
-import '../../../sdk/lib/_internal/compiler/implementation/elements/modelx.dart'
+import 'package:compiler/implementation/elements/modelx.dart'
     show ErroneousElementX;
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
     show MessageKind;
 
 void main() {

tests/compiler/dart2js/exit_code_test.dart

@@ -12,14 +12,14 @@ import 'dart:io' show Platform;
 import 'package:async_helper/async_helper.dart';
 import 'package:expect/expect.dart';
 
-import '../../../sdk/lib/_internal/compiler/compiler.dart' as api;
-import '../../../sdk/lib/_internal/compiler/implementation/dart2js.dart' as entry;
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/apiimpl.dart' as apiimpl;
-import '../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/resolution/resolution.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/scanner/scannerlib.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/util/util.dart';
+import 'package:compiler/compiler.dart' as api;
+import 'package:compiler/implementation/dart2js.dart' as entry;
+import 'package:compiler/implementation/dart2jslib.dart';
+import 'package:compiler/implementation/apiimpl.dart' as apiimpl;
+import 'package:compiler/implementation/elements/elements.dart';
+import 'package:compiler/implementation/resolution/resolution.dart';
+import 'package:compiler/implementation/scanner/scannerlib.dart';
+import 'package:compiler/implementation/util/util.dart';
 
 class TestCompiler extends apiimpl.Compiler {
   final String testMarker;

tests/compiler/dart2js/field_type_simple_inferer_test.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/types/types.dart'
+import 'package:compiler/implementation/types/types.dart'
     show TypeMask;
 
 import 'compiler_helper.dart';

tests/compiler/dart2js/find_my_name_test.dart

@@ -4,7 +4,7 @@
 
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart";
+import "package:compiler/implementation/elements/elements.dart";
 import "mock_compiler.dart";
 import "parser_helper.dart";
 

tests/compiler/dart2js/js_parser_statements_test.dart

@@ -6,8 +6,8 @@ import 'dart:async';
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
 import 'mock_compiler.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/js/js.dart' as jsAst;
-import '../../../sdk/lib/_internal/compiler/implementation/js/js.dart' show js;
+import 'package:compiler/implementation/js/js.dart' as jsAst;
+import 'package:compiler/implementation/js/js.dart' show js;
 
 
 Future testStatement(String statement, List arguments, String expect) {

tests/compiler/dart2js/js_parser_test.dart

@@ -6,8 +6,8 @@ import 'dart:async';
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
 import 'mock_compiler.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/js/js.dart' as jsAst;
-import '../../../sdk/lib/_internal/compiler/implementation/js/js.dart' show js;
+import 'package:compiler/implementation/js/js.dart' as jsAst;
+import 'package:compiler/implementation/js/js.dart' show js;
 
 Future testExpression(String expression, [String expect = ""]) {
   jsAst.Node node = js(expression);

tests/compiler/dart2js/least_upper_bound_test.dart

@@ -7,10 +7,10 @@ library subtype_test;
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
 import 'type_test_helper.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart_types.dart';
-import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart"
+import 'package:compiler/implementation/dart_types.dart';
+import "package:compiler/implementation/elements/elements.dart"
        show Element, ClassElement;
-import '../../../sdk/lib/_internal/compiler/implementation/util/util.dart'
+import 'package:compiler/implementation/util/util.dart'
        show Link;
 
 void main() {

tests/compiler/dart2js/link_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "package:expect/expect.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/util/util.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/util/util_implementation.dart';
+import 'package:compiler/implementation/util/util.dart';
+import 'package:compiler/implementation/util/util_implementation.dart';
 
 main() {
   test(const Link<Comparable>().prepend('three').prepend(2).prepend('one'),

tests/compiler/dart2js/list_tracer2_test.dart

@@ -7,8 +7,7 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
-import
-    '../../../sdk/lib/_internal/compiler/implementation/types/types.dart'
+import 'package:compiler/implementation/types/types.dart'
     show ContainerTypeMask, TypeMask;
 
 import 'compiler_helper.dart';

tests/compiler/dart2js/list_tracer3_test.dart

@@ -7,8 +7,7 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
-import
-    '../../../sdk/lib/_internal/compiler/implementation/types/types.dart'
+import 'package:compiler/implementation/types/types.dart'
     show ContainerTypeMask, TypeMask;
 
 import 'compiler_helper.dart';

tests/compiler/dart2js/list_tracer_test.dart

@@ -4,8 +4,7 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
-import
-    '../../../sdk/lib/_internal/compiler/implementation/types/types.dart'
+import 'package:compiler/implementation/types/types.dart'
     show ContainerTypeMask, TypeMask;
 
 import 'compiler_helper.dart';

tests/compiler/dart2js/lookup_member_test.dart

@@ -7,8 +7,8 @@ library subtype_test;
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'type_test_helper.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart_types.dart';
-import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart"
+import 'package:compiler/implementation/dart_types.dart';
+import "package:compiler/implementation/elements/elements.dart"
        show Element, ClassElement, MemberSignature, PublicName;
 
 void main() {

tests/compiler/dart2js/map_tracer_keys_test.dart

@@ -4,8 +4,7 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
-import
-    '../../../sdk/lib/_internal/compiler/implementation/types/types.dart'
+import 'package:compiler/implementation/types/types.dart'
     show ContainerTypeMask, TypeMask;
 
 import 'compiler_helper.dart';

tests/compiler/dart2js/map_tracer_test.dart

@@ -4,8 +4,7 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
-import
-    '../../../sdk/lib/_internal/compiler/implementation/types/types.dart'
+import 'package:compiler/implementation/types/types.dart'
     show MapTypeMask, TypeMask;
 
 import 'compiler_helper.dart';

tests/compiler/dart2js/members_test.dart

@@ -7,11 +7,11 @@ library members_test;
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'type_test_helper.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart_types.dart';
-import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart"
+import 'package:compiler/implementation/dart_types.dart';
+import "package:compiler/implementation/elements/elements.dart"
        show Element, ClassElement, MemberSignature, Name, PublicName,
             DeclaredMember, Member;
-import "../../../sdk/lib/_internal/compiler/implementation/resolution/class_members.dart"
+import "package:compiler/implementation/resolution/class_members.dart"
   show DeclaredMember, ErroneousMember, SyntheticMember;
 
 void main() {

tests/compiler/dart2js/memory_compiler.dart

@@ -6,16 +6,16 @@ library dart2js.test.memory_compiler;
 
 import 'memory_source_file_helper.dart';
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
        show NullSink;
 
-import '../../../sdk/lib/_internal/compiler/compiler.dart'
+import 'package:compiler/compiler.dart'
        show Diagnostic, DiagnosticHandler, CompilerOutputProvider;
 
 import 'dart:async';
 
-import '../../../sdk/lib/_internal/compiler/implementation/mirrors/source_mirrors.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/mirrors/analyze.dart';
+import 'package:compiler/implementation/mirrors/source_mirrors.dart';
+import 'package:compiler/implementation/mirrors/analyze.dart';
 
 class DiagnosticMessage {
   final Uri uri;

tests/compiler/dart2js/memory_source_file_helper.dart

@@ -7,19 +7,19 @@ library dart2js.test.memory_source_file_helper;
 import 'dart:async' show Future;
 export 'dart:io' show Platform;
 
-export '../../../sdk/lib/_internal/compiler/implementation/apiimpl.dart'
+export 'package:compiler/implementation/apiimpl.dart'
        show Compiler;
 
-export '../../../sdk/lib/_internal/compiler/implementation/filenames.dart'
+export 'package:compiler/implementation/filenames.dart'
        show currentDirectory;
 
-import '../../../sdk/lib/_internal/compiler/implementation/source_file.dart'
+import 'package:compiler/implementation/source_file.dart'
        show StringSourceFile;
 
-import '../../../sdk/lib/_internal/compiler/implementation/source_file_provider.dart'
+import 'package:compiler/implementation/source_file_provider.dart'
        show SourceFileProvider;
 
-export '../../../sdk/lib/_internal/compiler/implementation/source_file_provider.dart'
+export 'package:compiler/implementation/source_file_provider.dart'
        show SourceFileProvider, FormattingDiagnosticHandler;
 
 class MemorySourceFileProvider extends SourceFileProvider {

tests/compiler/dart2js/message_kind_helper.dart

@@ -7,7 +7,7 @@ library dart2js.test.message_kind_helper;
 import 'package:expect/expect.dart';
 import 'dart:async';
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart' show
+import 'package:compiler/implementation/dart2jslib.dart' show
     Compiler,
     MessageKind;
 

tests/compiler/dart2js/message_kind_test.dart

@@ -5,7 +5,7 @@
 import 'package:expect/expect.dart';
 import 'dart:async';
 import "package:async_helper/async_helper.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart' show
+import 'package:compiler/implementation/dart2jslib.dart' show
     DualKind,
     MessageKind;
 

tests/compiler/dart2js/metadata_test.dart

@@ -6,7 +6,7 @@ import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
 import 'compiler_helper.dart';
 import 'parser_helper.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
     show PrimitiveConstant;
 
 void checkPosition(Spannable spannable, Node node, String source, compiler) {

tests/compiler/dart2js/mirror_helper_rename_test.dart

@@ -6,16 +6,12 @@ import "package:expect/expect.dart";
 import 'dart:async';
 import "package:async_helper/async_helper.dart";
 import 'memory_compiler.dart' show compilerFor;
-import '../../../sdk/lib/_internal/compiler/implementation/apiimpl.dart' show
+import 'package:compiler/implementation/apiimpl.dart' show
     Compiler;
-import
-    '../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart'
-show
+import 'package:compiler/implementation/tree/tree.dart' show
     Node;
-import
-    '../../../sdk/lib/_internal/compiler/implementation/dart_backend/dart_backend.dart';
-import
-    '../../../sdk/lib/_internal/compiler/implementation/mirror_renamer/mirror_renamer.dart';
+import 'package:compiler/implementation/dart_backend/dart_backend.dart';
+import 'package:compiler/implementation/mirror_renamer/mirror_renamer.dart';
 
 main() {
   testWithMirrorHelperLibrary(minify: true);

tests/compiler/dart2js/mirror_helper_test.dart

@@ -6,26 +6,17 @@ import "package:expect/expect.dart";
 import 'dart:async';
 import "package:async_helper/async_helper.dart";
 import 'memory_compiler.dart' show compilerFor;
-import '../../../sdk/lib/_internal/compiler/implementation/apiimpl.dart' show
+import 'package:compiler/implementation/apiimpl.dart' show
     Compiler;
-import
-    '../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart'
-show
+import 'package:compiler/implementation/elements/elements.dart' show
     Element, LibraryElement, ClassElement;
-import
-    '../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart'
-show
+import 'package:compiler/implementation/tree/tree.dart' show
     Block, ExpressionStatement, FunctionExpression, Node, Send;
-import
-    '../../../sdk/lib/_internal/compiler/implementation/dart_backend/dart_backend.dart'
-show
+import 'package:compiler/implementation/dart_backend/dart_backend.dart' show
     DartBackend, ElementAst;
-import
-    '../../../sdk/lib/_internal/compiler/implementation/mirror_renamer/mirror_renamer.dart'
-show
+import 'package:compiler/implementation/mirror_renamer/mirror_renamer.dart' show
     MirrorRenamer;
 
-
 main() {
   testWithMirrorRenaming(minify: true);
   testWithMirrorRenaming(minify: false);

tests/compiler/dart2js/mirror_helper_unique_minification_test.dart

@@ -6,18 +6,13 @@ import "package:expect/expect.dart";
 import 'dart:async';
 import "package:async_helper/async_helper.dart";
 import 'memory_compiler.dart' show compilerFor;
-import '../../../sdk/lib/_internal/compiler/implementation/apiimpl.dart' show
+import 'package:compiler/implementation/apiimpl.dart' show
     Compiler;
-import
-    '../../../sdk/lib/_internal/compiler/implementation/dart_backend/dart_backend.dart'
-show
+import 'package:compiler/implementation/dart_backend/dart_backend.dart' show
     DartBackend;
-import
-    '../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart'
-show Identifier, Node, Send;
-import
-    '../../../sdk/lib/_internal/compiler/implementation/mirror_renamer/mirror_renamer.dart'
-show
+import 'package:compiler/implementation/tree/tree.dart' show
+    Identifier, Node, Send;
+import 'package:compiler/implementation/mirror_renamer/mirror_renamer.dart' show
     MirrorRenamer;
 
 main() {

tests/compiler/dart2js/mirror_system_helper.dart

@@ -5,12 +5,12 @@
 library mirror_system_helper;
 
 import 'dart:async';
-import '../../../sdk/lib/_internal/compiler/implementation/mirrors/source_mirrors.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirrors.dart';
+import 'package:compiler/implementation/mirrors/source_mirrors.dart';
+import 'package:compiler/implementation/mirrors/dart2js_mirrors.dart';
 import 'mock_compiler.dart';
 
-export '../../../sdk/lib/_internal/compiler/implementation/mirrors/source_mirrors.dart';
-export '../../../sdk/lib/_internal/compiler/implementation/mirrors/mirrors_util.dart';
+export 'package:compiler/implementation/mirrors/source_mirrors.dart';
+export 'package:compiler/implementation/mirrors/mirrors_util.dart';
 
 const String SOURCE = 'source';
 final Uri SOURCE_URI = new Uri(scheme: SOURCE, path: SOURCE);

tests/compiler/dart2js/mirror_tree_shaking_test.dart

@@ -8,14 +8,14 @@ import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'memory_source_file_helper.dart';
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
        show NullSink;
 
-import '../../../sdk/lib/_internal/compiler/compiler.dart'
+import 'package:compiler/compiler.dart'
        show Diagnostic;
 
 import 'dart:async';
-import '../../../sdk/lib/_internal/compiler/implementation/js_backend/js_backend.dart'
+import 'package:compiler/implementation/js_backend/js_backend.dart'
        show JavaScriptBackend;
 
 main() {

tests/compiler/dart2js/mirrors/mirrors_reader_test.dart

@@ -12,9 +12,9 @@ import "package:async_helper/async_helper.dart";
 
 import "mirrors_test_helper.dart";
 import "../../../lib/mirrors/mirrors_reader.dart";
-import "../../../../sdk/lib/_internal/compiler/implementation/util/util.dart";
-import "../../../../sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirrors.dart";
-import "../../../../sdk/lib/_internal/compiler/implementation/mirrors/source_mirrors.dart";
+import "package:compiler/implementation/util/util.dart";
+import "package:compiler/implementation/mirrors/dart2js_mirrors.dart";
+import "package:compiler/implementation/mirrors/source_mirrors.dart";
 
 class SourceMirrorsReader extends MirrorsReader {
   final Dart2JsMirrorSystem mirrorSystem;

tests/compiler/dart2js/mirrors/mirrors_test_helper.dart

@@ -5,9 +5,9 @@
 import 'dart:io';
 import 'dart:async';
 
-import '../../../../sdk/lib/_internal/compiler/implementation/mirrors/source_mirrors.dart';
-import '../../../../sdk/lib/_internal/compiler/implementation/mirrors/analyze.dart' as source_mirrors;
-import '../../../../sdk/lib/_internal/compiler/implementation/source_file_provider.dart';
+import 'package:compiler/implementation/mirrors/source_mirrors.dart';
+import 'package:compiler/implementation/mirrors/analyze.dart' as source_mirrors;
+import 'package:compiler/implementation/source_file_provider.dart';
 
 TypeMirror createInstantiation(TypeSourceMirror type,
                                List<TypeMirror> typeArguments) {

tests/compiler/dart2js/mirrors_exports_test.dart

@@ -6,7 +6,7 @@ import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
 import 'dart:async';
 import 'memory_compiler.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/mirrors/source_mirrors.dart';
+import 'package:compiler/implementation/mirrors/source_mirrors.dart';
 
 const SOURCE_FILES = const {
 'main.dart': '''

tests/compiler/dart2js/mirrors_lookup_test.dart

@@ -7,8 +7,8 @@ library dart2js.test.memory_source_file_helper;
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'memory_compiler.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/mirrors/source_mirrors.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/mirrors/mirrors_util.dart';
+import 'package:compiler/implementation/mirrors/source_mirrors.dart';
+import 'package:compiler/implementation/mirrors/mirrors_util.dart';
 
 const Map MEMORY_SOURCE_FILES = const {
   'main.dart': r"""

tests/compiler/dart2js/mirrors_test.dart

@@ -4,12 +4,12 @@
 
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/mirrors/source_mirrors.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/mirrors/mirrors_util.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/mirrors/analyze.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/filenames.dart'
+import 'package:compiler/implementation/mirrors/source_mirrors.dart';
+import 'package:compiler/implementation/mirrors/mirrors_util.dart';
+import 'package:compiler/implementation/mirrors/analyze.dart';
+import 'package:compiler/implementation/filenames.dart'
        show currentDirectory;
-import '../../../sdk/lib/_internal/compiler/implementation/source_file_provider.dart';
+import 'package:compiler/implementation/source_file_provider.dart';
 
 import 'dart:io';
 

tests/compiler/dart2js/mirrors_used_test.dart

@@ -12,18 +12,19 @@ import "package:async_helper/async_helper.dart";
 import 'memory_compiler.dart' show
     compilerFor;
 
-import '../../../sdk/lib/_internal/compiler/implementation/apiimpl.dart' show
+import 'package:compiler/implementation/apiimpl.dart' show
     Compiler;
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart' show
+import 'package:compiler/implementation/dart2jslib.dart' show
     Constant,
     TypeConstant;
 
-import
-    '../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart'
-show Element, Elements;
-import '../../../sdk/lib/_internal/compiler/implementation/js_backend/js_backend.dart'
-    show JavaScriptBackend;
+import 'package:compiler/implementation/elements/elements.dart' show
+    Element,
+    Elements;
+
+import 'package:compiler/implementation/js_backend/js_backend.dart' show
+    JavaScriptBackend;
 
 void expectOnlyVerboseInfo(Uri uri, int begin, int end, String message, kind) {
   if (kind.name == 'verbose info') {

tests/compiler/dart2js/missing_file_test.dart

@@ -10,10 +10,10 @@ import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'memory_source_file_helper.dart';
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
        show NullSink;
 
-import '../../../sdk/lib/_internal/compiler/compiler.dart'
+import 'package:compiler/compiler.dart'
        show DiagnosticHandler, Diagnostic;
 
 import 'dart:async';

tests/compiler/dart2js/mixin_typevariable_test.dart

@@ -7,8 +7,8 @@ library mixin_typevariable_test;
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'type_test_helper.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart_types.dart';
-import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart"
+import 'package:compiler/implementation/dart_types.dart';
+import "package:compiler/implementation/elements/elements.dart"
        show Element, ClassElement;
 
 void main() {

tests/compiler/dart2js/mock_compiler.dart

@@ -8,24 +8,24 @@ import "package:expect/expect.dart";
 import 'dart:async';
 import 'dart:collection';
 
-import '../../../sdk/lib/_internal/compiler/compiler.dart' as api;
-import '../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/resolution/resolution.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/source_file.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/util/util.dart';
+import 'package:compiler/compiler.dart' as api;
+import 'package:compiler/implementation/elements/elements.dart';
+import 'package:compiler/implementation/resolution/resolution.dart';
+import 'package:compiler/implementation/source_file.dart';
+import 'package:compiler/implementation/tree/tree.dart';
+import 'package:compiler/implementation/util/util.dart';
 import 'parser_helper.dart';
 
-import '../../../sdk/lib/_internal/compiler/implementation/elements/modelx.dart'
+import 'package:compiler/implementation/elements/modelx.dart'
     show ElementX,
          LibraryElementX,
          ErroneousElementX,
          FunctionElementX;
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
     hide TreeElementMapping;
 
-import '../../../sdk/lib/_internal/compiler/implementation/deferred_load.dart'
+import 'package:compiler/implementation/deferred_load.dart'
     show DeferredLoadTask,
          OutputUnit;
 

tests/compiler/dart2js/override_inheritance_test.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 import 'package:async_helper/async_helper.dart';
 import 'compiler_helper.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/resolution/class_members.dart'
+import 'package:compiler/implementation/resolution/class_members.dart'
     show MembersCreator;
 
 main() {

tests/compiler/dart2js/package_root_test.dart

@@ -10,10 +10,10 @@ import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'memory_source_file_helper.dart';
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
        show NullSink;
 
-import '../../../sdk/lib/_internal/compiler/compiler.dart'
+import 'package:compiler/compiler.dart'
        show DiagnosticHandler, Diagnostic;
 
 import 'dart:async';

tests/compiler/dart2js/parser_helper.dart

@@ -6,22 +6,22 @@ library parser_helper;
 
 import "package:expect/expect.dart";
 
-import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/scanner/scannerlib.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/source_file.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/util/util.dart";
+import "package:compiler/implementation/elements/elements.dart";
+import "package:compiler/implementation/tree/tree.dart";
+import "package:compiler/implementation/scanner/scannerlib.dart";
+import "package:compiler/implementation/source_file.dart";
+import "package:compiler/implementation/util/util.dart";
 
-import "../../../sdk/lib/_internal/compiler/implementation/elements/modelx.dart"
+import "package:compiler/implementation/elements/modelx.dart"
     show CompilationUnitElementX,
          LibraryElementX;
 
-import "../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart";
+import "package:compiler/implementation/dart2jslib.dart";
 
-export "../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart"
+export "package:compiler/implementation/dart2jslib.dart"
     show DiagnosticListener;
 // TODO(ahe): We should have token library to export instead.
-export "../../../sdk/lib/_internal/compiler/implementation/scanner/scannerlib.dart";
+export "package:compiler/implementation/scanner/scannerlib.dart";
 
 class LoggerCanceler implements DiagnosticListener {
   void cancel(String reason, {node, token, instruction, element}) {

tests/compiler/dart2js/parser_test.dart

@@ -4,7 +4,7 @@
 
 import "package:expect/expect.dart";
 import 'parser_helper.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart';
+import 'package:compiler/implementation/tree/tree.dart';
 
 void testStatement(String statement) {
   Node node = parseStatement(statement);

tests/compiler/dart2js/part_of_test.dart

@@ -7,7 +7,7 @@ library part_of_test;
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
 import 'mock_compiler.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
     show MessageKind;
 
 final libraryUri = Uri.parse('test:library.dart');

tests/compiler/dart2js/patch_test.dart

@@ -5,10 +5,10 @@
 import 'dart:async';
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/util/util.dart";
+import "package:compiler/implementation/dart2jslib.dart";
+import "package:compiler/implementation/elements/elements.dart";
+import "package:compiler/implementation/tree/tree.dart";
+import "package:compiler/implementation/util/util.dart";
 import "mock_compiler.dart";
 import "parser_helper.dart";
 

tests/compiler/dart2js/private_test.dart

@@ -6,8 +6,8 @@ import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
 import 'mock_compiler.dart';
 
-import '../../../sdk/lib/_internal/compiler/implementation/source_file.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart';
+import 'package:compiler/implementation/source_file.dart';
+import 'package:compiler/implementation/dart2jslib.dart';
 
 const String PRIVATE_SOURCE_URI = 'src:private';
 const String PRIVATE_SOURCE = '''

tests/compiler/dart2js/reexport_handled_test.dart

@@ -7,7 +7,7 @@ library reexport_handled_test;
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
 import 'mock_compiler.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart'
+import 'package:compiler/implementation/elements/elements.dart'
     show Element,
          LibraryElement;
 

tests/compiler/dart2js/resolution_test.dart

@@ -9,7 +9,7 @@ import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'compiler_helper.dart';
 import 'parser_helper.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/apiimpl.dart';
+import 'package:compiler/implementation/apiimpl.dart';
 
 const String NO_RUNTIME_TYPE = r"""
 import 'dart:core' as prefix;

tests/compiler/dart2js/resolver_test.dart

@@ -7,12 +7,12 @@ import 'dart:async';
 import "package:async_helper/async_helper.dart";
 import 'dart:collection';
 
-import "../../../sdk/lib/_internal/compiler/implementation/resolution/resolution.dart";
+import "package:compiler/implementation/resolution/resolution.dart";
 import "compiler_helper.dart";
 import "parser_helper.dart";
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart_types.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/elements/modelx.dart';
+import 'package:compiler/implementation/dart_types.dart';
+import 'package:compiler/implementation/elements/modelx.dart';
 
 Node buildIdentifier(String name) => new Identifier(scan(name));
 

tests/compiler/dart2js/scanner_offset_length_test.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "package:expect/expect.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/scanner/scannerlib.dart';
+import 'package:compiler/implementation/scanner/scannerlib.dart';
 
 Token scan(String text) =>
     new StringScanner.fromString(text, includeComments: true).tokenize();

tests/compiler/dart2js/scanner_test.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "package:expect/expect.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/scanner/scannerlib.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/util/characters.dart';
+import 'package:compiler/implementation/scanner/scannerlib.dart';
+import 'package:compiler/implementation/util/characters.dart';
 import 'dart:typed_data';
 
 Token scan(List<int> bytes) => new Utf8BytesScanner.fromBytes(bytes).tokenize();

tests/compiler/dart2js/setlet_test.dart

@@ -4,7 +4,7 @@
 
 import "package:expect/expect.dart";
 import 'dart:collection';
-import '../../../sdk/lib/_internal/compiler/implementation/util/setlet.dart';
+import 'package:compiler/implementation/util/setlet.dart';
 
 main() {
   for (int i = 1; i <= 32; i++) {

tests/compiler/dart2js/simple_inferrer_callers_test.dart

@@ -7,8 +7,8 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/types/types.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/inferrer/type_graph_inferrer.dart';
+import 'package:compiler/implementation/types/types.dart';
+import 'package:compiler/implementation/inferrer/type_graph_inferrer.dart';
 
 import 'compiler_helper.dart';
 import 'parser_helper.dart';

tests/compiler/dart2js/simple_inferrer_relations_test.dart

@@ -4,9 +4,7 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
-import
-    '../../../sdk/lib/_internal/compiler/implementation/types/types.dart'
-    show TypeMask;
+import 'package:compiler/implementation/types/types.dart' show TypeMask;
 
 import 'compiler_helper.dart';
 import 'parser_helper.dart';

tests/compiler/dart2js/simple_inferrer_test.dart

@@ -4,9 +4,7 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
-import
-    '../../../sdk/lib/_internal/compiler/implementation/types/types.dart'
-    show TypeMask;
+import 'package:compiler/implementation/types/types.dart' show TypeMask;
 import 'type_mask_test_helper.dart';
 
 import 'compiler_helper.dart';

tests/compiler/dart2js/simple_inferrer_try_catch_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/types/types.dart'
+import 'package:compiler/implementation/types/types.dart'
     show TypeMask;
 
 import 'compiler_helper.dart';

tests/compiler/dart2js/source_map_d2js_validity_test.dart

@@ -8,7 +8,7 @@ import 'dart:io';
 import 'package:async_helper/async_helper.dart';
 
 import 'source_map_validator_helper.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart2js.dart' as entry;
+import 'package:compiler/implementation/dart2js.dart' as entry;
 
 void main() {
   asyncTest(() => createTempDir().then((Directory tmpDir) {
@@ -26,4 +26,4 @@ void main() {
         tmpDir.deleteSync(recursive: true);
       });
   }));
-}
+}

tests/compiler/dart2js/source_mapping_test.dart

@@ -5,10 +5,10 @@
 import 'dart:async';
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/source_file.dart';
+import "package:compiler/implementation/dart2jslib.dart";
+import 'package:compiler/implementation/source_file.dart';
 import "mock_compiler.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/js_backend/js_backend.dart';
+import 'package:compiler/implementation/js_backend/js_backend.dart';
 
 Future<CodeBuffer> compileAll(SourceFile sourceFile) {
   MockCompiler compiler = new MockCompiler.internal();

tests/compiler/dart2js/space_test.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:io';
-import '../../../sdk/lib/_internal/compiler/implementation/dart2js.dart'
+import 'package:compiler/implementation/dart2js.dart'
   as dart2js;
 
 main() {

tests/compiler/dart2js/stats_test.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:expect/expect.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/helpers/helpers.dart';
+import 'package:compiler/implementation/helpers/helpers.dart';
 
 class CollectingOutput implements StatsOutput {
   final StringBuffer sb = new StringBuffer();

tests/compiler/dart2js/strip_comment_test.dart

@@ -5,7 +5,7 @@
 library strip_comment_test;
 
 import "package:expect/expect.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/mirrors/mirrors_util.dart';
+import 'package:compiler/implementation/mirrors/mirrors_util.dart';
 
 testComment(String strippedText, String commentText) {
   Expect.stringEquals(strippedText, stripComment(commentText));

tests/compiler/dart2js/subtype_test.dart

@@ -7,8 +7,8 @@ library subtype_test;
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'type_test_helper.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart_types.dart';
-import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart"
+import 'package:compiler/implementation/dart_types.dart';
+import "package:compiler/implementation/elements/elements.dart"
        show Element, ClassElement;
 
 void main() {

tests/compiler/dart2js/type_checker_test.dart

@@ -5,19 +5,19 @@
 import 'dart:async';
 import 'package:async_helper/async_helper.dart';
 import 'package:expect/expect.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/util/util.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/source_file.dart';
+import 'package:compiler/implementation/elements/elements.dart';
+import 'package:compiler/implementation/tree/tree.dart';
+import 'package:compiler/implementation/util/util.dart';
+import 'package:compiler/implementation/source_file.dart';
 import 'mock_compiler.dart';
 import 'parser_helper.dart';
 
-import '../../../sdk/lib/_internal/compiler/implementation/elements/modelx.dart'
+import 'package:compiler/implementation/elements/modelx.dart'
   show ElementX, CompilationUnitElementX, FunctionElementX;
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart';
+import 'package:compiler/implementation/dart2jslib.dart';
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart_types.dart';
+import 'package:compiler/implementation/dart_types.dart';
 
 final MessageKind NOT_ASSIGNABLE = MessageKind.NOT_ASSIGNABLE;
 final MessageKind MEMBER_NOT_FOUND = MessageKind.MEMBER_NOT_FOUND;

tests/compiler/dart2js/type_combination_test.dart

@@ -5,9 +5,9 @@
 import "package:async_helper/async_helper.dart";
 import "package:expect/expect.dart";
 import "compiler_helper.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/types/types.dart";
+import "package:compiler/implementation/types/types.dart";
 import "type_mask_test_helper.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/js_backend/js_backend.dart';
+import 'package:compiler/implementation/js_backend/js_backend.dart';
 
 TypeMask nullType;
 TypeMask objectType;

tests/compiler/dart2js/type_equals_test.dart

@@ -4,7 +4,7 @@
 
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/dart_types.dart';
+import 'package:compiler/implementation/dart_types.dart';
 import "compiler_helper.dart";
 import "parser_helper.dart";
 

tests/compiler/dart2js/type_mask_test.dart

@@ -6,7 +6,7 @@ import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'compiler_helper.dart';
 import 'parser_helper.dart';
-import "../../../sdk/lib/_internal/compiler/implementation/types/types.dart";
+import "package:compiler/implementation/types/types.dart";
 
 const String CODE = """
 class A {}

tests/compiler/dart2js/type_mask_test_helper.dart

@@ -4,8 +4,8 @@
 
 library type_mask_test_helper;
 
-import '../../../sdk/lib/_internal/compiler/implementation/types/types.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/types/types.dart';
+import 'package:compiler/implementation/dart2jslib.dart'
     show Compiler;
 
 TypeMask simplify(TypeMask mask, Compiler compiler) {

tests/compiler/dart2js/type_order_test.dart

@@ -7,8 +7,8 @@ library subtype_test;
 import 'package:expect/expect.dart';
 import 'package:async_helper/async_helper.dart';
 import 'type_test_helper.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart_types.dart';
-import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart"
+import 'package:compiler/implementation/dart_types.dart';
+import "package:compiler/implementation/elements/elements.dart"
        show Element, ClassElement, TypedefElement;
 
 void main() {

tests/compiler/dart2js/type_representation_test.dart

@@ -7,11 +7,11 @@ library subtype_test;
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'type_test_helper.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart_types.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/js/js.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart'
+import 'package:compiler/implementation/dart_types.dart';
+import 'package:compiler/implementation/js/js.dart';
+import 'package:compiler/implementation/elements/elements.dart'
        show Element, ClassElement;
-import '../../../sdk/lib/_internal/compiler/implementation/js_backend/js_backend.dart'
+import 'package:compiler/implementation/js_backend/js_backend.dart'
        show JavaScriptBackend, TypeRepresentationGenerator;
 
 void main() {

tests/compiler/dart2js/type_substitution_test.dart

@@ -6,7 +6,7 @@ library type_substitution_test;
 
 import "package:expect/expect.dart";
 import "package:async_helper/async_helper.dart";
-import '../../../sdk/lib/_internal/compiler/implementation/dart_types.dart';
+import 'package:compiler/implementation/dart_types.dart';
 import "compiler_helper.dart";
 import "parser_helper.dart";
 import "type_test_helper.dart";

tests/compiler/dart2js/type_test_helper.dart

@@ -8,14 +8,14 @@ import 'dart:async';
 import 'package:expect/expect.dart';
 import 'compiler_helper.dart' as mock;
 import 'memory_compiler.dart' as memory;
-import '../../../sdk/lib/_internal/compiler/implementation/dart_types.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart_types.dart';
+import 'package:compiler/implementation/dart2jslib.dart'
     show Compiler;
-import '../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart'
+import 'package:compiler/implementation/elements/elements.dart'
     show Element,
          TypeDeclarationElement,
          ClassElement;
-import '../../../sdk/lib/_internal/compiler/implementation/util/util.dart'
+import 'package:compiler/implementation/util/util.dart'
     show Link, LinkBuilder;
 
 GenericType instantiate(TypeDeclarationElement element,

tests/compiler/dart2js/type_variable_occurrence_test.dart

@@ -7,8 +7,8 @@ library subtype_test;
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'type_test_helper.dart';
-import '../../../sdk/lib/_internal/compiler/implementation/dart_types.dart';
-import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart"
+import 'package:compiler/implementation/dart_types.dart';
+import "package:compiler/implementation/elements/elements.dart"
        show Element, ClassElement;
 
 void main() {

tests/compiler/dart2js/union_type_test.dart

@@ -7,8 +7,8 @@ import "package:async_helper/async_helper.dart";
 import "compiler_helper.dart";
 import "parser_helper.dart";
 
-import "../../../sdk/lib/_internal/compiler/implementation/types/types.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/dart_types.dart";
+import "package:compiler/implementation/types/types.dart";
+import "package:compiler/implementation/dart_types.dart";
 
 main() {
   asyncTest(() => MockCompiler.create((MockCompiler compiler) {

tests/compiler/dart2js/unneeded_part_js_test.dart

@@ -8,10 +8,10 @@ import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import 'memory_source_file_helper.dart';
 
-import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
+import 'package:compiler/implementation/dart2jslib.dart'
        show NullSink;
 
-import '../../../sdk/lib/_internal/compiler/compiler.dart'
+import 'package:compiler/compiler.dart'
        show Diagnostic;
 
 import 'dart:async';

tests/compiler/dart2js/unparser2_test.dart

@@ -3,18 +3,18 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import "package:expect/expect.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/scanner/scannerlib.dart";
-import "../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart";
+import "package:compiler/implementation/scanner/scannerlib.dart";
+import "package:compiler/implementation/tree/tree.dart";
 
-import "../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart"
+import "package:compiler/implementation/dart2jslib.dart"
     show DiagnosticListener,
          Script;
 
-import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dart"
+import "package:compiler/implementation/elements/elements.dart"
     show CompilationUnitElement,
          LibraryElement;
 
-import "../../../sdk/lib/_internal/compiler/implementation/elements/modelx.dart"
+import "package:compiler/implementation/elements/modelx.dart"
     show CompilationUnitElementX,
          LibraryElementX;