fix(typing): Remove re-export of the Promise built-in type.

Instead, ts2dart can add the 'dart:async' import whenever
Promise is used.

Fixes #6468

modules/angular2/examples/router/ts/can_activate/can_activate_spec.ts

@@ -1,5 +1,4 @@
 import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
-import {Promise} from 'angular2/src/facade/async';
 
 function waitForElement(selector) {
   var EC = (<any>protractor).ExpectedConditions;

modules/angular2/examples/router/ts/can_deactivate/can_deactivate_spec.ts

@@ -1,5 +1,4 @@
 import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
-import {Promise} from 'angular2/src/facade/async';
 
 function waitForElement(selector) {
   var EC = (<any>protractor).ExpectedConditions;

modules/angular2/examples/router/ts/on_activate/on_activate_spec.ts

@@ -1,5 +1,4 @@
 import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
-import {Promise} from 'angular2/src/facade/async';
 
 function waitForElement(selector) {
   var EC = (<any>protractor).ExpectedConditions;

modules/angular2/examples/router/ts/on_deactivate/on_deactivate_spec.ts

@@ -1,5 +1,4 @@
 import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
-import {Promise} from 'angular2/src/facade/async';
 
 function waitForElement(selector) {
   var EC = (<any>protractor).ExpectedConditions;

modules/angular2/examples/router/ts/reuse/reuse_spec.ts

@@ -1,5 +1,4 @@
 import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
-import {Promise} from 'angular2/src/facade/async';
 
 function waitForElement(selector) {
   var EC = (<any>protractor).ExpectedConditions;

modules/angular2/platform/browser.ts

@@ -13,7 +13,6 @@ export {
 } from 'angular2/src/platform/browser_common';
 
 import {Type, isPresent, CONST_EXPR} from 'angular2/src/facade/lang';
-import {Promise} from 'angular2/src/facade/promise';
 import {
   BROWSER_PROVIDERS,
   BROWSER_APP_COMMON_PROVIDERS

modules/angular2/platform/browser_static.ts

@@ -12,7 +12,6 @@ export {
 } from 'angular2/src/platform/browser_common';
 
 import {Type, isPresent} from 'angular2/src/facade/lang';
-import {Promise} from 'angular2/src/facade/promise';
 import {
   BROWSER_PROVIDERS,
   BROWSER_APP_COMMON_PROVIDERS

modules/angular2/src/common/pipes/async_pipe.ts

@@ -1,5 +1,5 @@
 import {isBlank, isPresent, isPromise, CONST} from 'angular2/src/facade/lang';
-import {Promise, ObservableWrapper, Observable, EventEmitter} from 'angular2/src/facade/async';
+import {ObservableWrapper, Observable, EventEmitter} from 'angular2/src/facade/async';
 import {
   Pipe,
   Injectable,

modules/angular2/src/compiler/runtime_compiler.ts

@@ -4,7 +4,6 @@ import {TemplateCompiler} from './template_compiler';
 
 import {Injectable} from 'angular2/src/core/di';
 import {Type} from 'angular2/src/facade/lang';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
 
 export abstract class RuntimeCompiler extends Compiler {
   abstract compileInHost(componentType: Type): Promise<HostViewFactoryRef>;

modules/angular2/src/compiler/style_compiler.ts

@@ -3,7 +3,7 @@ import {SourceModule, SourceExpression, moduleRef} from './source_module';
 import {ViewEncapsulation} from 'angular2/src/core/metadata/view';
 import {XHR} from 'angular2/src/compiler/xhr';
 import {IS_DART, StringWrapper, isBlank} from 'angular2/src/facade/lang';
-import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {ShadowCss} from 'angular2/src/compiler/shadow_css';
 import {UrlResolver} from 'angular2/src/compiler/url_resolver';
 import {extractStyleUrls} from './style_url_resolver';

modules/angular2/src/compiler/template_compiler.ts

@@ -14,7 +14,7 @@ import {
   MapWrapper,
   StringMapWrapper
 } from 'angular2/src/facade/collection';
-import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {
   createHostComponentMeta,
   CompileDirectiveMetadata,

modules/angular2/src/compiler/template_normalizer.ts

@@ -5,7 +5,7 @@ import {
 } from './directive_metadata';
 import {isPresent, isBlank} from 'angular2/src/facade/lang';
 import {BaseException} from 'angular2/src/facade/exceptions';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 
 import {XHR} from 'angular2/src/compiler/xhr';
 import {UrlResolver} from 'angular2/src/compiler/url_resolver';

modules/angular2/src/compiler/xhr.ts

@@ -1,5 +1,3 @@
-import {Promise} from 'angular2/src/facade/async';
-
 // TODO: vsavkin rename it into TemplateLoader
 /**
  * An interface for retrieving documents by URL that the compiler uses

modules/angular2/src/compiler/xhr_mock.ts

@@ -2,7 +2,7 @@ import {XHR} from 'angular2/src/compiler/xhr';
 import {ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection';
 import {isBlank, isPresent, normalizeBlank} from 'angular2/src/facade/lang';
 import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
-import {PromiseCompleter, PromiseWrapper, Promise} from 'angular2/src/facade/async';
+import {PromiseCompleter, PromiseWrapper} from 'angular2/src/facade/async';
 
 /**
  * A mock implementation of {@link XHR} that allows outgoing requests to be mocked

modules/angular2/src/core/application_ref.ts

@@ -15,12 +15,7 @@ import {
   PLATFORM_INITIALIZER,
   APP_INITIALIZER
 } from './application_tokens';
-import {
-  Promise,
-  PromiseWrapper,
-  PromiseCompleter,
-  ObservableWrapper
-} from 'angular2/src/facade/async';
+import {PromiseWrapper, PromiseCompleter, ObservableWrapper} from 'angular2/src/facade/async';
 import {ListWrapper} from 'angular2/src/facade/collection';
 import {TestabilityRegistry, Testability} from 'angular2/src/core/testability/testability';
 import {

modules/angular2/src/core/linker/compiler.ts

@@ -3,7 +3,7 @@ import {HostViewFactoryRef} from 'angular2/src/core/linker/view_ref';
 import {Injectable} from 'angular2/src/core/di';
 import {Type, isBlank, stringify} from 'angular2/src/facade/lang';
 import {BaseException} from 'angular2/src/facade/exceptions';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {reflector} from 'angular2/src/core/reflection/reflection';
 import {HostViewFactory} from 'angular2/src/core/linker/view';
 import {HostViewFactoryRef_} from 'angular2/src/core/linker/view_ref';

modules/angular2/src/core/linker/dynamic_component_loader.ts

@@ -1,7 +1,6 @@
 import {Key, Injector, ResolvedProvider, Provider, provide, Injectable} from 'angular2/src/core/di';
 import {Compiler} from './compiler';
 import {isType, Type, stringify, isPresent} from 'angular2/src/facade/lang';
-import {Promise} from 'angular2/src/facade/async';
 import {AppViewManager} from 'angular2/src/core/linker/view_manager';
 import {ElementRef, ElementRef_} from './element_ref';
 import {HostViewRef} from './view_ref';

modules/angular2/src/facade/async.ts

@@ -1,8 +1,5 @@
 import {global, isPresent, noop} from 'angular2/src/facade/lang';
-// We make sure promises are in a separate file so that we can use promises
-// without depending on rxjs.
-import {Promise} from 'angular2/src/facade/promise';
-export {PromiseWrapper, Promise, PromiseCompleter} from 'angular2/src/facade/promise';
+export {PromiseWrapper, PromiseCompleter} from 'angular2/src/facade/promise';
 
 import {Observable} from 'rxjs/Observable';
 import {Subject} from 'rxjs/Subject';

modules/angular2/src/facade/promise.dart

@@ -2,7 +2,6 @@ library angular2.core.facade.promise;
 
 import 'dart:async';
 import 'dart:async' as async;
-export 'dart:async' show Future;
 
 class PromiseWrapper {
   static Future resolve(obj) => new Future.value(obj);

modules/angular2/src/facade/promise.ts

@@ -1,6 +1,3 @@
-// Promises are put into their own facade file so that they can be used without
-// introducing a dependency on rxjs. They are re-exported through facade/async.
-export {Promise};
 
 export interface PromiseCompleter<R> {
   promise: Promise<R>;

modules/angular2/src/mock/mock_application_ref.ts

@@ -4,7 +4,6 @@ import {Type} from 'angular2/src/facade/lang';
 import {ComponentRef} from 'angular2/src/core/linker/dynamic_component_loader';
 import {Provider, Injector} from 'angular2/src/core/di';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
-import {Promise} from 'angular2/src/facade/async';
 
 /**
  * A no-op implementation of {@link ApplicationRef}, useful for testing.

modules/angular2/src/platform/browser/ruler.ts

@@ -1,4 +1,4 @@
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {DomAdapter} from 'angular2/src/platform/dom/dom_adapter';
 import {ElementRef} from 'angular2/src/core/linker/element_ref';
 

modules/angular2/src/platform/browser/xhr_impl.ts

@@ -1,4 +1,4 @@
-import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/facade/promise';
+import {PromiseWrapper, PromiseCompleter} from 'angular2/src/facade/promise';
 import {isPresent} from 'angular2/src/facade/lang';
 import {XHR} from 'angular2/src/compiler/xhr';
 

modules/angular2/src/router/async_route_handler.ts

@@ -1,4 +1,3 @@
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
 import {isPresent, Type} from 'angular2/src/facade/lang';
 
 import {RouteHandler} from './route_handler';

modules/angular2/src/router/component_recognizer.ts

@@ -1,7 +1,7 @@
 import {isBlank, isPresent} from 'angular2/src/facade/lang';
 import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
 import {Map, MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 
 import {
   AbstractRecognizer,

modules/angular2/src/router/instruction.ts

@@ -1,6 +1,6 @@
 import {Map, MapWrapper, StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
 import {isPresent, isBlank, normalizeBlank, Type, CONST_EXPR} from 'angular2/src/facade/lang';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 
 
 /**

modules/angular2/src/router/lifecycle_annotations.ts

@@ -5,7 +5,6 @@
 
 import {makeDecorator} from 'angular2/src/core/util/decorators';
 import {CanActivate as CanActivateAnnotation} from './lifecycle_annotations_impl';
-import {Promise} from 'angular2/src/facade/async';
 import {ComponentInstruction} from './instruction';
 
 export {

modules/angular2/src/router/route_handler.ts

@@ -1,4 +1,3 @@
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
 import {Type} from 'angular2/src/facade/lang';
 import {RouteData} from './instruction';
 

modules/angular2/src/router/route_recognizer.ts

@@ -1,6 +1,6 @@
 import {isPresent, isBlank} from 'angular2/src/facade/lang';
 import {BaseException} from 'angular2/src/facade/exceptions';
-import {PromiseWrapper, Promise} from 'angular2/src/facade/promise';
+import {PromiseWrapper} from 'angular2/src/facade/promise';
 import {Map} from 'angular2/src/facade/collection';
 
 import {RouteHandler} from './route_handler';

modules/angular2/src/router/route_registry.ts

@@ -1,5 +1,5 @@
 import {ListWrapper, Map, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {
   isPresent,
   isArray,

modules/angular2/src/router/router.ts

@@ -1,4 +1,4 @@
-import {Promise, PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
 import {Map, StringMapWrapper, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
 import {isBlank, isString, isPresent, Type, isArray} from 'angular2/src/facade/lang';
 import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';

modules/angular2/src/router/router_outlet.ts

@@ -1,4 +1,4 @@
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {StringMapWrapper} from 'angular2/src/facade/collection';
 import {isBlank, isPresent} from 'angular2/src/facade/lang';
 import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';

modules/angular2/src/router/sync_route_handler.ts

@@ -1,4 +1,4 @@
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {isPresent, Type} from 'angular2/src/facade/lang';
 
 import {RouteHandler} from './route_handler';

modules/angular2/src/testing/test_component_builder.ts

@@ -12,7 +12,6 @@ import {
 } from 'angular2/core';
 
 import {Type, isPresent, isBlank} from 'angular2/src/facade/lang';
-import {Promise} from 'angular2/src/facade/async';
 import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection';
 
 import {ViewRef_} from 'angular2/src/core/linker/view_ref';

modules/angular2/src/web_workers/shared/client_message_broker.ts

@@ -1,7 +1,6 @@
 import {MessageBus} from "angular2/src/web_workers/shared/message_bus";
 import {print, isPresent, DateWrapper, stringify} from "angular2/src/facade/lang";
 import {
-  Promise,
   PromiseCompleter,
   PromiseWrapper,
   ObservableWrapper,

modules/angular2/src/web_workers/shared/service_message_broker.ts

@@ -3,7 +3,7 @@ import {ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection';
 import {Serializer} from "angular2/src/web_workers/shared/serializer";
 import {isPresent, Type, FunctionWrapper} from "angular2/src/facade/lang";
 import {MessageBus} from "angular2/src/web_workers/shared/message_bus";
-import {EventEmitter, Promise, PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async';
+import {EventEmitter, PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async';
 
 export abstract class ServiceMessageBrokerFactory {
   /**

modules/angular2/src/web_workers/ui/platform_location.ts

@@ -9,7 +9,7 @@ import {PRIMITIVE, Serializer} from 'angular2/src/web_workers/shared/serializer'
 import {bind} from './bind';
 import {LocationType} from 'angular2/src/web_workers/shared/serialized_types';
 import {MessageBus} from 'angular2/src/web_workers/shared/message_bus';
-import {Promise, EventEmitter, ObservableWrapper, PromiseWrapper} from 'angular2/src/facade/async';
+import {EventEmitter, ObservableWrapper, PromiseWrapper} from 'angular2/src/facade/async';
 import {UrlChangeListener} from 'angular2/src/router/platform_location';
 
 @Injectable()

modules/angular2/src/web_workers/worker/platform_location.ts

@@ -12,7 +12,7 @@ import {
 } from 'angular2/src/web_workers/shared/client_message_broker';
 import {ROUTER_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api';
 import {LocationType} from 'angular2/src/web_workers/shared/serialized_types';
-import {Promise, PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
 import {BaseException} from 'angular2/src/facade/exceptions';
 import {PRIMITIVE, Serializer} from 'angular2/src/web_workers/shared/serializer';
 import {MessageBus} from 'angular2/src/web_workers/shared/message_bus';

modules/angular2/src/web_workers/worker/router_providers.ts

@@ -2,7 +2,6 @@ import {ApplicationRef, Provider, NgZone, APP_INITIALIZER} from 'angular2/core';
 import {PlatformLocation} from 'angular2/src/router/platform_location';
 import {WebWorkerPlatformLocation} from './platform_location';
 import {ROUTER_PROVIDERS_COMMON} from 'angular2/src/router/router_providers_common';
-import {Promise} from 'angular2/src/facade/async';
 
 export var WORKER_APP_ROUTER = [
   ROUTER_PROVIDERS_COMMON,

modules/angular2/src/web_workers/worker/xhr_impl.ts

@@ -1,5 +1,4 @@
 import {Injectable} from 'angular2/src/core/di';
-import {Promise} from 'angular2/src/facade/async';
 import {XHR} from 'angular2/src/compiler/xhr';
 import {
   FnArg,

modules/angular2/test/compiler/change_detector_compiler_spec.ts

@@ -16,7 +16,6 @@ import {provide} from 'angular2/src/core/di';
 
 import {CONST_EXPR, stringify, IS_DART} from 'angular2/src/facade/lang';
 import {MapWrapper} from 'angular2/src/facade/collection';
-import {Promise} from 'angular2/src/facade/async';
 
 import {ChangeDetectionCompiler} from 'angular2/src/compiler/change_detector_compiler';
 

modules/angular2/test/compiler/eval_module.ts

@@ -1,4 +1,4 @@
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {isPresent, global, StringWrapper} from 'angular2/src/facade/lang';
 
 var evalCounter = 0;

modules/angular2/test/compiler/style_compiler_spec.ts

@@ -25,7 +25,7 @@ import {
   isArray,
   IS_DART
 } from 'angular2/src/facade/lang';
-import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {evalModule} from './eval_module';
 import {StyleCompiler} from 'angular2/src/compiler/style_compiler';
 import {

modules/angular2/test/compiler/template_compiler_spec.ts

@@ -13,7 +13,7 @@ import {
   beforeEachProviders
 } from 'angular2/testing_internal';
 
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {Type, isPresent, isBlank, stringify, isString, IS_DART} from 'angular2/src/facade/lang';
 import {
   MapWrapper,

modules/angular2/test/compiler/xhr_mock_spec.ts

@@ -10,7 +10,7 @@ import {
   it,
 } from 'angular2/testing_internal';
 import {MockXHR} from 'angular2/src/compiler/xhr_mock';
-import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {isPresent} from 'angular2/src/facade/lang';
 
 export function main() {

modules/angular2/test/core/linker/integration_spec.ts

@@ -40,7 +40,6 @@ import {
   EventEmitter,
   ObservableWrapper,
   PromiseCompleter,
-  Promise
 } from 'angular2/src/facade/async';
 
 import {

modules/angular2/test/facade/async_dart_spec.dart

@@ -1,6 +1,7 @@
 /// This file contains tests that make sense only in Dart
 library angular2.test.facade.async_dart_spec;
 
+import 'dart:async';
 import 'package:angular2/testing_internal.dart';
 import 'package:angular2/src/facade/async.dart';
 

modules/angular2/test/router/component_recognizer_spec.ts

@@ -17,7 +17,7 @@ import {ComponentRecognizer} from 'angular2/src/router/component_recognizer';
 
 import {Route, Redirect} from 'angular2/src/router/route_config_decorator';
 import {parser} from 'angular2/src/router/url_parser';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/promise';
+import {PromiseWrapper} from 'angular2/src/facade/promise';
 
 
 export function main() {

modules/angular2/test/router/integration/lifecycle_hook_spec.ts

@@ -18,7 +18,6 @@ import {
 import {provide, Component, Injector, Inject, View} from 'angular2/core';
 import {isPresent} from 'angular2/src/facade/lang';
 import {
-  Promise,
   PromiseWrapper,
   PromiseCompleter,
   EventEmitter,

modules/angular2/test/router/integration/navigation_spec.ts

@@ -16,7 +16,7 @@ import {
 } from 'angular2/testing_internal';
 
 import {provide, Component, View, Injector, Inject} from 'angular2/core';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 
 import {Router, RouterOutlet, RouterLink, RouteParams, RouteData, Location} from 'angular2/router';
 import {

modules/angular2/test/router/route_registry_spec.ts

@@ -10,7 +10,7 @@ import {
   SpyObject
 } from 'angular2/testing_internal';
 
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {Type, IS_DART} from 'angular2/src/facade/lang';
 
 import {RouteRegistry} from 'angular2/src/router/route_registry';

modules/angular2/test/router/router_spec.ts

@@ -12,7 +12,7 @@ import {
 } from 'angular2/testing_internal';
 import {SpyRouterOutlet} from './spies';
 import {Type} from 'angular2/src/facade/lang';
-import {Promise, PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async';
 import {ListWrapper} from 'angular2/src/facade/collection';
 
 import {Router, RootRouter} from 'angular2/src/router/router';

modules/angular2_material/src/components/dialog/dialog.ts

@@ -16,7 +16,7 @@ import {
   ViewEncapsulation
 } from 'angular2/core';
 
-import {ObservableWrapper, Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {ObservableWrapper, PromiseWrapper} from 'angular2/src/facade/async';
 import {isPresent, Type} from 'angular2/src/facade/lang';
 import {DOM} from 'angular2/src/platform/dom/dom_adapter';
 import {MouseEvent, KeyboardEvent} from 'angular2/src/facade/browser';

modules/benchpress/src/metric.ts

@@ -1,5 +1,4 @@
 import {bind, provide, Provider} from 'angular2/src/core/di';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
 import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
 
 /**

modules/benchpress/src/metric/multi_metric.ts

@@ -1,6 +1,6 @@
 import {bind, provide, Binding, Provider, Injector, OpaqueToken} from 'angular2/src/core/di';
 import {StringMapWrapper} from 'angular2/src/facade/collection';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 
 import {Metric} from '../metric';
 

modules/benchpress/src/metric/perflog_metric.ts

@@ -1,4 +1,4 @@
-import {PromiseWrapper, Promise, TimerWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper, TimerWrapper} from 'angular2/src/facade/async';
 import {
   isPresent,
   isBlank,

modules/benchpress/src/reporter.ts

@@ -1,5 +1,4 @@
 import {bind, provide, Provider} from 'angular2/src/core/di';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
 import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
 import {MeasureValues} from './measure_values';
 

modules/benchpress/src/reporter/console_reporter.ts

@@ -1,6 +1,6 @@
 import {print, isPresent, isBlank, NumberWrapper} from 'angular2/src/facade/lang';
 import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {Math} from 'angular2/src/facade/math';
 import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di';
 

modules/benchpress/src/reporter/json_file_reporter.ts

@@ -1,5 +1,5 @@
 import {DateWrapper, isPresent, isBlank, Json} from 'angular2/src/facade/lang';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 
 import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di';
 

modules/benchpress/src/reporter/multi_reporter.ts

@@ -1,5 +1,5 @@
 import {bind, provide, Provider, Injector, OpaqueToken} from 'angular2/src/core/di';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 
 import {MeasureValues} from '../measure_values';
 import {Reporter} from '../reporter';

modules/benchpress/src/runner.ts

@@ -1,6 +1,6 @@
 import {Injector, bind, provide, Provider} from 'angular2/src/core/di';
 import {isPresent, isBlank} from 'angular2/src/facade/lang';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 
 import {Sampler, SampleState} from './sampler';
 import {ConsoleReporter} from './reporter/console_reporter';

modules/benchpress/src/sampler.ts

@@ -1,5 +1,5 @@
 import {isPresent, isBlank, Date, DateWrapper} from 'angular2/src/facade/lang';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di';
 
 import {Metric} from './metric';

modules/benchpress/src/web_driver_adapter.ts

@@ -1,5 +1,4 @@
 import {bind, provide, Provider} from 'angular2/src/core/di';
-import {Promise} from 'angular2/src/facade/async';
 import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
 import {Map} from 'angular2/src/facade/collection';
 

modules/benchpress/src/web_driver_extension.ts

@@ -2,7 +2,6 @@ import {bind, provide, Provider, Injector, OpaqueToken} from 'angular2/src/core/
 
 import {isBlank, isPresent} from 'angular2/src/facade/lang';
 import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
 
 import {Options} from './common_options';
 

modules/benchpress/src/webdriver/async_webdriver_adapter.dart

@@ -1,7 +1,7 @@
 library benchpress.src.webdriver.async_webdriver_adapter_dart;
 
+import 'dart:async';
 import 'package:webdriver/webdriver.dart' show WebDriver, LogEntry;
-import 'package:angular2/src/facade/async.dart' show Future;
 import '../web_driver_adapter.dart' show WebDriverAdapter;
 
 class AsyncWebDriverAdapter extends WebDriverAdapter {

modules/benchpress/src/webdriver/chrome_driver_extension.ts

@@ -12,7 +12,6 @@ import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
 
 import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
 import {WebDriverAdapter} from '../web_driver_adapter';
-import {Promise} from 'angular2/src/facade/async';
 import {Options} from '../common_options';
 
 /**

modules/benchpress/src/webdriver/firefox_driver_extension.ts

@@ -2,7 +2,6 @@ import {bind, provide, Provider} from 'angular2/src/core/di';
 import {isPresent, StringWrapper} from 'angular2/src/facade/lang';
 import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
 import {WebDriverAdapter} from '../web_driver_adapter';
-import {Promise} from 'angular2/src/facade/async';
 
 export class FirefoxDriverExtension extends WebDriverExtension {
   static get BINDINGS(): Provider[] { return _PROVIDERS; }

modules/benchpress/src/webdriver/ios_driver_extension.ts

@@ -4,7 +4,6 @@ import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
 
 import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
 import {WebDriverAdapter} from '../web_driver_adapter';
-import {Promise} from 'angular2/src/facade/async';
 
 export class IOsDriverExtension extends WebDriverExtension {
   // TODO(tbosch): use static values when our transpiler supports them

modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts

@@ -1,4 +1,4 @@
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {bind, provide, Provider} from 'angular2/src/core/di';
 import {WebDriverAdapter} from '../web_driver_adapter';
 
@@ -21,9 +21,8 @@ export class SeleniumWebDriverAdapter extends WebDriverAdapter {
         (data) => completer.resolve(convertToLocalProcess(data)), completer.reject);
     return completer.promise;
   }
-  b
 
-      waitFor(callback): Promise<any> {
+  waitFor(callback): Promise<any> {
     return this._convertPromise(this._driver.controlFlow().execute(callback));
   }
 

modules/benchpress/test/metric/multi_metric_spec.ts

@@ -12,7 +12,7 @@ import {
 } from 'angular2/testing_internal';
 
 import {ListWrapper} from 'angular2/src/facade/collection';
-import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 
 import {Metric, MultiMetric, bind, provide, Injector} from 'benchpress/common';
 

modules/benchpress/test/metric/perflog_metric_spec.ts

@@ -12,7 +12,7 @@ import {
 } from 'angular2/testing_internal';
 
 import {StringMapWrapper} from 'angular2/src/facade/collection';
-import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {isPresent, isBlank} from 'angular2/src/facade/lang';
 
 import {

modules/benchpress/test/reporter/multi_reporter_spec.ts

@@ -11,7 +11,7 @@ import {
   xit,
 } from 'angular2/testing_internal';
 
-import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 import {DateWrapper} from 'angular2/src/facade/lang';
 
 import {Reporter, MultiReporter, bind, provide, Injector, MeasureValues} from 'benchpress/common';

modules/benchpress/test/runner_spec.ts

@@ -24,7 +24,7 @@ import {
   SampleState
 } from 'benchpress/common';
 import {isBlank} from 'angular2/src/facade/lang';
-import {Promise, PromiseWrapper} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 
 export function main() {
   describe('runner', () => {

modules/benchpress/test/sampler_spec.ts

@@ -12,7 +12,7 @@ import {
 } from 'angular2/testing_internal';
 
 import {isBlank, isPresent, stringify, Date, DateWrapper} from 'angular2/src/facade/lang';
-import {PromiseWrapper, Promise} from 'angular2/src/facade/async';
+import {PromiseWrapper} from 'angular2/src/facade/async';
 
 import {
   Sampler,

modules/playground/e2e_test/hash_routing/hash_location_spec.ts

@@ -1,5 +1,4 @@
 import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
-import {Promise} from 'angular2/src/facade/async';
 
 function waitForElement(selector) {
   var EC = (<any>protractor).ExpectedConditions;

modules/playground/e2e_test/relative_assets/assets_spec.ts

@@ -1,5 +1,4 @@
 import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
-import {Promise} from 'angular2/src/facade/async';
 
 function waitForElement(selector) {
   var EC = (<any>protractor).ExpectedConditions;

modules/playground/e2e_test/routing/routing_spec.ts

@@ -1,5 +1,4 @@
 import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
-import {Promise} from 'angular2/src/facade/async';
 
 function waitForElement(selector) {
   var EC = (<any>protractor).ExpectedConditions;

modules/playground/e2e_test/web_workers/kitchen_sink/kitchen_sink_spec.ts

@@ -1,5 +1,4 @@
 import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
-import {Promise} from 'angular2/src/facade/async';
 
 describe('WebWorkers Kitchen Sink', function() {
   afterEach(() => {

modules/playground/e2e_test/web_workers/todo/todo_spec.ts

@@ -1,5 +1,4 @@
 import {verifyNoBrowserErrors} from 'angular2/src/testing/e2e_util';
-import {Promise} from 'angular2/src/facade/async';
 
 describe('WebWorkers Todo', function() {
   afterEach(() => {

modules/playground/src/routing/inbox-app.ts

@@ -9,7 +9,7 @@ import {
   RouteParams
 } from 'angular2/router';
 import * as db from './data';
-import {ObservableWrapper, PromiseWrapper, Promise} from 'angular2/src/facade/async';
+import {ObservableWrapper, PromiseWrapper} from 'angular2/src/facade/async';
 import {ListWrapper} from 'angular2/src/facade/collection';
 import {isPresent, DateWrapper} from 'angular2/src/facade/lang';