Adds test target for Dartium on Android.

tools/testing/dart/browser_controller.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 library browser;
 
 import "dart:async";
 import "dart:convert" show LineSplitter, UTF8;
 import "dart:core";
 import "dart:io";
 
@@ skipping 558 matching lines @@
         return _adbDevice.killAll().then((_) => true);
       });
     }
     return new Future.value(true);
   }
 
   String toString() => "ContentShellOnAndroid";
 }
 
 
+class DartiumOnAndroid extends Browser {
+  static const String viewAction = 'android.intent.action.VIEW';
+  static const String dartiumPackage = 'com.google.android.apps.chrome';
+
+  AdbDevice _adbDevice;
+
+  DartiumOnAndroid(this._adbDevice);
+
+  Future<bool> start(String url) {
+    var dartiumIntent = new Intent(
+        viewAction, dartiumPackage, '.Main', url);
+
+    return _adbDevice.waitForBootCompleted().then((_) {
+      return _adbDevice.forceStop(dartiumIntent.package);
+    }).then((_) {
+      return _adbDevice.killAll();
+    }).then((_) {
+      return _adbDevice.adbRoot();
+    }).then((_) {
+      return _adbDevice.setProp("DART_FORWARDING_PRINT", "1");
+    }).then((_) {
+      return _adbDevice.startActivity(dartiumIntent).then((_) => true);
+    });
+  }
+
+  Future<bool> close() {
+    if (_adbDevice != null) {
+      return _adbDevice.forceStop(dartiumPackage).then((_) {
+        return _adbDevice.killAll().then((_) => true);
+      });
+    }
+    return new Future.value(true);
+  }
+
+  String toString() => "DartiumOnAndroid";
+}

[kustermann, 2013/10/25 19:23:03]

We have now three of these classes with similar functionality. It would be nice
if you could extract the common things to a base class, something like

class AndroidBrowserBase extends Browser {
  static const String viewAction = 'android.intent.action.VIEW';

  AdbDevice _adbDevice;

  AndroidBrowserBase(this._adbDevice);

  Future<bool> close() {
    ...
  }
}

You can keep the 'start()' method (although they're a bit redundant as well).

[zra, 2013/10/25 21:33:34]

I'm not comfortable modifying AndroidChrome since I can't test it locally, but
I've refactored DartiumOnAndroid and ContentShellOnAndroid to eliminate
redundancies. I'll commit for now, but there is more cleanup possible, so
further comments are certainly welcome.

+
+
 class Firefox extends Browser {
   static const String enablePopUp =
       'user_pref("dom.disable_open_during_load", false);';
   static const String disableDefaultCheck =
       'user_pref("browser.shell.checkDefaultBrowser", false);';
   static const String disableScriptTimeLimit =
       'user_pref("dom.max_script_run_time", 0);';
 
   static String _binary = _getBinary();
 
@@ skipping 174 matching lines @@
   }
 
   Future<List<Browser>> getBrowsers() {
     // TODO(kustermann): This is a hackisch way to accomplish it and should
     // be encapsulated
     var browsersCompleter = new Completer();
     var androidBrowserCreationMapping = {
       'chromeOnAndroid' : (AdbDevice device) => new AndroidChrome(device),
       'ContentShellOnAndroid' : (AdbDevice device) =>
           new ContentShellOnAndroid(device),
+      'DartiumOnAndroid' : (AdbDevice device) =>
+          new DartiumOnAndroid(device),
     };
     if (androidBrowserCreationMapping.containsKey(browserName)) {
       AdbHelper.listDevices().then((deviceIds) {
         if (deviceIds.length > 0) {
           var browsers = [];
           for (int i = 0; i < deviceIds.length; i++) {
             var id = "BROWSER$i";
             var device = new AdbDevice(deviceIds[i]);
             adbDeviceMapping[id] = device;
             var browser = androidBrowserCreationMapping[browserName](device);
@@ skipping 104 matching lines @@
       status.currentTest = null;
 
       // We don't want to start a new browser if we are terminating.
       if (underTermination) return;
       var browser;
       var new_id = id;
       if (browserName == 'chromeOnAndroid') {
         browser = new AndroidChrome(adbDeviceMapping[id]);
       } else if (browserName == 'ContentShellOnAndroid') {
         browser = new ContentShellOnAndroid(adbDeviceMapping[id]);
+      } else if (browserName == 'DartiumOnAndroid') {
+        browser = new DartiumOnAndroid(adbDeviceMapping[id]);
       } else {
         browserStatus.remove(id);
         browser = getInstance();
         new_id = "BROWSER$browserIdCount";
         browserIdCount++;
         browserStatus[new_id] = new BrowserTestingStatus(browser);
       }
       browser.id = new_id;
       browser.start(testingServer.getDriverUrl(new_id)).then((success) {
         // We may have started terminating in the mean time.
@@ skipping 418 matching lines @@
     Dart test driver, number of tests: <div id="number"></div><br>
     Currently executing: <div id="currently_executing"></div><br>
     Unhandled error: <div id="unhandled_error"></div>
     <iframe id="embedded_iframe"></iframe>
   </body>
 </html>
 """;
     return driverContent;
   }
 }