Working SimpleHTML test front end

tools/testing/dart/browser_controller.dart

Index: tools/testing/dart/browser_controller.dart
diff --git a/tools/testing/dart/browser_controller.dart b/tools/testing/dart/browser_controller.dart
index 8a57d695c0c761830ea74a3faff33a8e3d869905..e7012d06157e6f0bd7a74b1cef3596478d5db760 100644
--- a/tools/testing/dart/browser_controller.dart
+++ b/tools/testing/dart/browser_controller.dart
@@ -786,7 +786,7 @@ class BrowserTest {
 
   String toJSON() => JSON.encode({'url': url,
                                   'id': id,
-                                  'isSimpleHtmlTest': false});
+                                  'isHtmlTest': false});
 }
 
 
@@ -801,7 +801,7 @@ class HtmlTest extends BrowserTest {
 
   String toJSON() => JSON.encode({'url': url,
                                   'id': id,
-                                  'isSimpleHtmlTest': true,
+                                  'isHtmlTest': true,
                                   'expectedMessages': expectedMessages});
 }
 
@@ -1415,9 +1415,8 @@ class BrowserTestingServer {
       // Browsers will be killed shortly, send them a terminate signal so
       // that they stop pulling.
       return terminateSignal;
-    } else {
-      return nextTest == null ? waitSignal : nextTest.toJSON();
     }
+    return nextTest == null ? waitSignal : nextTest.toJSON();
   }
 
   String getDriverUrl(String browserId) {