fix(benchpress): make code compile and unit tests green again

modules/@angular/benchpress/src/webdriver/async_webdriver_adapter.dart

@@ -1,35 +0,0 @@
-library benchpress.src.webdriver.async_webdriver_adapter_dart;
-
-import 'dart:async';
-import 'package:webdriver/webdriver.dart' show WebDriver, LogEntry;
-import '../web_driver_adapter.dart' show WebDriverAdapter;
-
-class AsyncWebDriverAdapter extends WebDriverAdapter {
-  WebDriver _driver;
-  AsyncWebDriverAdapter(this._driver);
-
-  Future waitFor(Function callback) {
-    return callback();
-  }
-
-  Future executeScript(String script) {
-    return _driver.execute(script, const []);
-  }
-
-  Future executeAsyncScript(String script) {
-    return _driver.executeAsync(script, const []);
-  }
-
-  Future<Map> capabilities() {
-    return new Future.value(_driver.capabilities);
-  }
-
-  Future<List<Map>> logs(String type) {
-    return _driver.logs
-        .get(type)
-        .map((LogEntry entry) => {'message': entry.message})
-        .fold(<Map>[], (log, Map entry) {
-      return log..add(entry);
-    });
-  }
-}

modules/@angular/benchpress/src/webdriver/chrome_driver_extension.ts

@@ -6,12 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ListWrapper, StringMapWrapper} from '@angular/facade/src/collection';
-import {Json, NumberWrapper, StringWrapper, isBlank, isPresent} from '@angular/facade/src/lang';
+import {Inject, Injectable} from '@angular/core';
 
 import {Options} from '../common_options';
+import {ListWrapper, StringMapWrapper} from '../facade/collection';
+import {NumberWrapper, StringWrapper, isBlank, isPresent} from '../facade/lang';
 import {WebDriverAdapter} from '../web_driver_adapter';
-import {PerfLogFeatures, WebDriverExtension} from '../web_driver_extension';
+import {PerfLogEvent, PerfLogFeatures, WebDriverExtension} from '../web_driver_extension';
+
 
 
 /**
@@ -21,13 +23,13 @@ import {PerfLogFeatures, WebDriverExtension} from '../web_driver_extension';
  * In order to collect the frame rate related metrics, add 'benchmark'
  * to the list above.
  */
+@Injectable()
 export class ChromeDriverExtension extends WebDriverExtension {
-  // TODO(tbosch): use static values when our transpiler supports them
-  static get PROVIDERS(): any[] { return _PROVIDERS; }
+  static PROVIDERS = [ChromeDriverExtension];
 
   private _majorChromeVersion: number;
 
-  constructor(private _driver: WebDriverAdapter, userAgent: string) {
+  constructor(private _driver: WebDriverAdapter, @Inject(Options.USER_AGENT) userAgent: string) {
     super();
     this._majorChromeVersion = this._parseChromeVersion(userAgent);
   }
@@ -63,15 +65,15 @@ export class ChromeDriverExtension extends WebDriverExtension {
 
   // See [Chrome Trace Event
   // Format](https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/edit)
-  readPerfLog(): Promise<any> {
+  readPerfLog(): Promise<PerfLogEvent[]> {
     // TODO(tbosch): Chromedriver bug https://code.google.com/p/chromedriver/issues/detail?id=1098
     // Need to execute at least one command so that the browser logs can be read out!
     return this._driver.executeScript('1+1')
         .then((_) => this._driver.logs('performance'))
         .then((entries) => {
-          var events = [];
+          var events: PerfLogEvent[] = [];
           entries.forEach(entry => {
-            var message = Json.parse(entry['message'])['message'];
+            var message = JSON.parse(entry['message'])['message'];
             if (StringWrapper.equals(message['method'], 'Tracing.dataCollected')) {
               events.push(message['params']);
             }
@@ -84,8 +86,7 @@ export class ChromeDriverExtension extends WebDriverExtension {
   }
 
   private _convertPerfRecordsToEvents(
-      chromeEvents: Array<{[key: string]: any}>,
-      normalizedEvents: Array<{[key: string]: any}> = null) {
+      chromeEvents: Array<{[key: string]: any}>, normalizedEvents: PerfLogEvent[] = null) {
     if (isBlank(normalizedEvents)) {
       normalizedEvents = [];
     }
@@ -128,7 +129,8 @@ export class ChromeDriverExtension extends WebDriverExtension {
     return normalizedEvents;
   }
 
-  private _processAsPreChrome45Event(event, categories, majorGCPids) {
+  private _processAsPreChrome45Event(
+      event: {[key: string]: any}, categories: string[], majorGCPids: {[key: string]: any}) {
     var name = event['name'];
     var args = event['args'];
     var pid = event['pid'];
@@ -148,7 +150,7 @@ export class ChromeDriverExtension extends WebDriverExtension {
       return normalizeEvent(event, {'name': 'render'});
     } else if (this._isEvent(
                    categories, name, ['disabled-by-default-devtools.timeline'], 'GCEvent')) {
-      var normArgs = {
+      var normArgs: {[key: string]: any} = {
         'usedHeapSize': isPresent(args['usedHeapSizeAfter']) ? args['usedHeapSizeAfter'] :
                                                                args['usedHeapSizeBefore']
       };
@@ -164,7 +166,7 @@ export class ChromeDriverExtension extends WebDriverExtension {
     return null;  // nothing useful in this event
   }
 
-  private _processAsPostChrome44Event(event, categories) {
+  private _processAsPostChrome44Event(event: {[key: string]: any}, categories: string[]) {
     var name = event['name'];
     var args = event['args'];
     if (this._isEvent(categories, name, ['devtools.timeline', 'v8'], 'MajorGC')) {
@@ -230,14 +232,14 @@ export class ChromeDriverExtension extends WebDriverExtension {
 }
 
 function normalizeEvent(
-    chromeEvent: {[key: string]: any}, data: {[key: string]: any}): {[key: string]: any} {
+    chromeEvent: {[key: string]: any}, data: {[key: string]: any}): PerfLogEvent {
   var ph = chromeEvent['ph'];
   if (StringWrapper.equals(ph, 'S')) {
     ph = 'b';
   } else if (StringWrapper.equals(ph, 'F')) {
     ph = 'e';
   }
-  var result =
+  var result: {[key: string]: any} =
       {'pid': chromeEvent['pid'], 'ph': ph, 'cat': 'timeline', 'ts': chromeEvent['ts'] / 1000};
   if (chromeEvent['ph'] === 'X') {
     var dur = chromeEvent['dur'];
@@ -249,9 +251,3 @@ function normalizeEvent(
   StringMapWrapper.forEach(data, (value, prop) => { result[prop] = value; });
   return result;
 }
-
-var _PROVIDERS = [{
-  provide: ChromeDriverExtension,
-  useFactory: (driver, userAgent) => new ChromeDriverExtension(driver, userAgent),
-  deps: [WebDriverAdapter, Options.USER_AGENT]
-}];

modules/@angular/benchpress/src/webdriver/firefox_driver_extension.ts

@@ -6,13 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {StringWrapper, isPresent} from '@angular/facade/src/lang';
+import {Injectable} from '@angular/core';
 
+import {StringWrapper, isPresent} from '../facade/lang';
 import {WebDriverAdapter} from '../web_driver_adapter';
-import {PerfLogFeatures, WebDriverExtension} from '../web_driver_extension';
+import {PerfLogEvent, PerfLogFeatures, WebDriverExtension} from '../web_driver_extension';
 
+@Injectable()
 export class FirefoxDriverExtension extends WebDriverExtension {
-  static get PROVIDERS(): any[] { return _PROVIDERS; }
+  static PROVIDERS = [FirefoxDriverExtension];
 
   private _profilerStarted: boolean;
 
@@ -39,7 +41,7 @@ export class FirefoxDriverExtension extends WebDriverExtension {
     return this._driver.executeScript(script);
   }
 
-  readPerfLog(): Promise<any> {
+  readPerfLog(): Promise<PerfLogEvent> {
     return this._driver.executeAsyncScript('var cb = arguments[0]; window.getProfile(cb);');
   }
 
@@ -49,9 +51,3 @@ export class FirefoxDriverExtension extends WebDriverExtension {
     return StringWrapper.equals(capabilities['browserName'].toLowerCase(), 'firefox');
   }
 }
-
-var _PROVIDERS = [{
-  provide: FirefoxDriverExtension,
-  useFactory: (driver) => new FirefoxDriverExtension(driver),
-  deps: [WebDriverAdapter]
-}];

modules/@angular/benchpress/src/webdriver/ios_driver_extension.ts

@@ -6,14 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Json, StringWrapper, isBlank, isPresent} from '@angular/facade/src/lang';
+import {Injectable} from '@angular/core';
 
+import {StringWrapper, isBlank, isPresent} from '../facade/lang';
 import {WebDriverAdapter} from '../web_driver_adapter';
-import {PerfLogFeatures, WebDriverExtension} from '../web_driver_extension';
+import {PerfLogEvent, PerfLogFeatures, WebDriverExtension} from '../web_driver_extension';
 
+@Injectable()
 export class IOsDriverExtension extends WebDriverExtension {
-  // TODO(tbosch): use static values when our transpiler supports them
-  static get PROVIDERS(): any[] { return _PROVIDERS; }
+  static PROVIDERS = [IOsDriverExtension];
 
   constructor(private _driver: WebDriverAdapter) { super(); }
 
@@ -38,9 +39,9 @@ export class IOsDriverExtension extends WebDriverExtension {
     return this._driver.executeScript('1+1')
         .then((_) => this._driver.logs('performance'))
         .then((entries) => {
-          var records = [];
+          var records: any[] = [];
           entries.forEach(entry => {
-            var message = Json.parse(entry['message'])['message'];
+            var message = JSON.parse(entry['message'])['message'];
             if (StringWrapper.equals(message['method'], 'Timeline.eventRecorded')) {
               records.push(message['params']['record']);
             }
@@ -50,12 +51,12 @@ export class IOsDriverExtension extends WebDriverExtension {
   }
 
   /** @internal */
-  private _convertPerfRecordsToEvents(records: any[], events: any[] = null) {
+  private _convertPerfRecordsToEvents(records: any[], events: PerfLogEvent[] = null) {
     if (isBlank(events)) {
       events = [];
     }
     records.forEach((record) => {
-      var endEvent = null;
+      var endEvent: PerfLogEvent = null;
       var type = record['type'];
       var data = record['data'];
       var startTime = record['startTime'];
@@ -95,8 +96,9 @@ export class IOsDriverExtension extends WebDriverExtension {
   }
 }
 
-function createEvent(ph, name, time, args = null) {
-  var result = {
+function createEvent(
+    ph: 'X' | 'B' | 'E' | 'b' | 'e', name: string, time: number, args: any = null) {
+  var result: PerfLogEvent = {
     'cat': 'timeline',
     'name': name,
     'ts': time,
@@ -111,24 +113,18 @@ function createEvent(ph, name, time, args = null) {
   return result;
 }
 
-function createStartEvent(name, time, args = null) {
+function createStartEvent(name: string, time: number, args: any = null) {
   return createEvent('B', name, time, args);
 }
 
-function createEndEvent(name, time, args = null) {
+function createEndEvent(name: string, time: number, args: any = null) {
   return createEvent('E', name, time, args);
 }
 
-function createMarkStartEvent(name, time) {
+function createMarkStartEvent(name: string, time: number) {
   return createEvent('b', name, time);
 }
 
-function createMarkEndEvent(name, time) {
+function createMarkEndEvent(name: string, time: number) {
   return createEvent('e', name, time);
 }
-
-var _PROVIDERS = [{
-  provide: IOsDriverExtension,
-  useFactory: (driver) => new IOsDriverExtension(driver),
-  deps: [WebDriverAdapter]
-}];

modules/@angular/benchpress/src/webdriver/selenium_webdriver_adapter.dart

@@ -1,3 +0,0 @@
-library benchpress.src.webdriver.selenium_webdriver_adapter;
-
-//no dart implementation

modules/@angular/benchpress/src/webdriver/selenium_webdriver_adapter.ts

@@ -10,18 +10,19 @@ import * as webdriver from 'selenium-webdriver';
 
 import {WebDriverAdapter} from '../web_driver_adapter';
 
-
-
 /**
  * Adapter for the selenium-webdriver.
  */
 export class SeleniumWebDriverAdapter extends WebDriverAdapter {
-  static get PROTRACTOR_BINDINGS(): any[] { return _PROTRACTOR_BINDINGS; }
+  static PROTRACTOR_PROVIDERS = [{
+    provide: WebDriverAdapter,
+    useFactory: () => new SeleniumWebDriverAdapter((<any>global).browser)
+  }];
 
   constructor(private _driver: any) { super(); }
 
   /** @internal */
-  private _convertPromise(thenable) {
+  private _convertPromise(thenable: PromiseLike<any>) {
     var resolve: (result: any) => void;
     var reject: (error: any) => void;
     var promise = new Promise((res, rej) => {
@@ -31,12 +32,11 @@ export class SeleniumWebDriverAdapter extends WebDriverAdapter {
     thenable.then(
         // selenium-webdriver uses an own Node.js context,
         // so we need to convert data into objects of this context.
-        // Previously needed for rtts_asserts.
-        (data) => resolve(convertToLocalProcess(data)), reject);
+        (data: any) => resolve(convertToLocalProcess(data)), reject);
     return promise;
   }
 
-  waitFor(callback): Promise<any> {
+  waitFor(callback: () => any): Promise<any> {
     return this._convertPromise(this._driver.controlFlow().execute(callback));
   }
 
@@ -50,7 +50,7 @@ export class SeleniumWebDriverAdapter extends WebDriverAdapter {
 
   capabilities(): Promise<any> {
     return this._convertPromise(
-        this._driver.getCapabilities().then((capsObject) => capsObject.serialize()));
+        this._driver.getCapabilities().then((capsObject: any) => capsObject.serialize()));
   }
 
   logs(type: string): Promise<any> {
@@ -62,16 +62,10 @@ export class SeleniumWebDriverAdapter extends WebDriverAdapter {
   }
 }
 
-function convertToLocalProcess(data): Object {
+function convertToLocalProcess(data: any): Object {
   var serialized = JSON.stringify(data);
   if ('' + serialized === 'undefined') {
     return undefined;
   }
   return JSON.parse(serialized);
 }
-
-var _PROTRACTOR_BINDINGS = [{
-  provide: WebDriverAdapter,
-  useFactory: () => new SeleniumWebDriverAdapter((<any>global).browser),
-  deps: []
-}];