Do some housekeeping in tools/testing/dart

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 UTF8, JSON;
 import "dart:core";
 import "dart:io";
 import "dart:math" show min;
@@ skipping 681 matching lines @@
         .write('Android device id: ${_adbDevice.deviceId}\n');
   }
 
   String toString() => _config.name;
 }
 
 class AndroidChrome extends Browser {
   static const String viewAction = 'android.intent.action.VIEW';
   static const String mainAction = 'android.intent.action.MAIN';
   static const String chromePackage = 'com.android.chrome';
+  static const String chromeActivity = '.Main';
   static const String browserPackage = 'com.android.browser';
+  static const String browserActivity = '.BrowserActivity';
   static const String firefoxPackage = 'org.mozilla.firefox';
+  static const String firefoxActivity = '.App';
   static const String turnScreenOnPackage = 'com.google.dart.turnscreenon';
+  static const String turnScreenOnActivity = '.Main';
 
   AdbDevice _adbDevice;
 
   AndroidChrome(this._adbDevice);
 
   Future<bool> start(String url) {
-    var browserIntent =
-        new Intent(viewAction, browserPackage, '.BrowserActivity', url);
-    var chromeIntent = new Intent(viewAction, chromePackage, '.Main', url);
-    var firefoxIntent = new Intent(viewAction, firefoxPackage, '.App', url);
+    var chromeIntent =
+        new Intent(viewAction, chromePackage, chromeActivity, url);
     var turnScreenOnIntent =
-        new Intent(mainAction, turnScreenOnPackage, '.Main');
+        new Intent(mainAction, turnScreenOnPackage, turnScreenOnActivity);
 
     var testing_resources_dir =
         new Path('third_party/android_testing_resources');
     if (!new Directory(testing_resources_dir.toNativePath()).existsSync()) {
       DebugLogger.error("$testing_resources_dir doesn't exist. Exiting now.");
       exit(1);
     }
 
     var chromeAPK = testing_resources_dir.append('com.android.chrome-1.apk');
     var turnScreenOnAPK = testing_resources_dir.append('TurnScreenOn.apk');
@@ skipping 817 matching lines @@
       var embedded_iframe_div = document.getElementById('embedded_iframe_div');
       var embedded_iframe = document.getElementById('embedded_iframe');
       var number_div = document.getElementById('number');
       var executing_div = document.getElementById('currently_executing');
       var error_div = document.getElementById('unhandled_error');
       var use_iframe = ${useIframe};
       var start = new Date();
 
       // Object that holds the state of an HTML test
       var html_test;
-  
+
       function newTaskHandler() {
         if (this.readyState == this.DONE) {
           if (this.status == 200) {
             if (this.responseText == '$waitSignal') {
               setTimeout(getNextTask, 500);
             } else if (this.responseText == '$terminateSignal') {
               // Don't do anything, we will be killed shortly.
             } else {
               var elapsed = new Date() - start;
               var nextTask = JSON.parse(this.responseText);
               var url = nextTask.url;
               next_id = nextTask.id;
               if (nextTask.isHtmlTest) {
                 html_test = {
                   expected_messages: nextTask.expectedMessages,
                   found_message_count: 0,
                   double_received_messages: [],
                   unexpected_messages: [],
                   found_messages: {}
                 };
                 for (var i = 0; i < html_test.expected_messages.length; ++i) {
                   html_test.found_messages[html_test.expected_messages[i]] = 0;
                 }
               } else {
                 html_test = null;
-              }               
+              }
               run(url);
             }
           } else {
             reportError('Could not contact the server and get a new task');
           }
         }
       }
 
       function contactBrowserController(method,
                                         path,
@@ skipping 13 matching lines @@
       function getNextTask() {
         // Until we have the next task we set the current_id to a specific
         // negative value.
         contactBrowserController(
             'GET', '$nextTestPath/$browserId', newTaskHandler, "", false);
       }
 
       function childError(message, filename, lineno, colno, error) {
         sendStatusUpdate();
         if (error) {
-          reportMessage('FAIL:' + filename + ':' + lineno + 
+          reportMessage('FAIL:' + filename + ':' + lineno +
                ':' + colno + ':' + message + '\\n' + error.stack, false, false);
         } else if (filename) {
-          reportMessage('FAIL:' + filename + ':' + lineno + 
+          reportMessage('FAIL:' + filename + ':' + lineno +
                ':' + colno + ':' + message, false, false);
         } else {
           reportMessage('FAIL: ' + message, false, false);
         }
         return true;
       }
 
       function setChildHandlers(e) {
         embedded_iframe.contentWindow.addEventListener('message',
                                                        childMessageHandler,
@@ skipping 171 matching lines @@
       // This handler is installed on the child window when it sends the
       // 'detect_errors' event.  Every HTML test must send 'detect_errors' to
       // its parent window as its first action, so all errors will be caught.
       function childMessageHandler(e) {
         var msg = e.data;
         if (typeof msg != 'string') return;
         if (msg in html_test.found_messages) {
           html_test.found_messages[msg]++;
           if (html_test.found_messages[msg] == 1) {
             html_test.found_message_count++;
-          } else {  
+          } else {
             html_test.double_received_messages.push(msg);
             sendStatusUpdate();
           }
         } else {
           html_test.unexpected_messages.push(msg);
           sendStatusUpdate();
         }
         if (html_test.found_message_count ==
             html_test.expected_messages.length) {
           reportMessage('Test done: PASS', false, false);
@@ skipping 29 matching lines @@
     </div>
     <div id="embedded_iframe_div" class="test box">
       <iframe id="embedded_iframe"></iframe>
     </div>
   </body>
 </html>
 """;
     return driverContent;
   }
 }