Substantially increase browser timeouts.

R=kevmoo@google.com

Review URL: https://codereview.chromium.org//1230983002 .
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 531ae7a..ddfb455 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 * Properly report load errors caused by failing to start browsers.
 
+* Substantially increase browser timeouts. These timeouts are the cause of a lot
+  of flakiness, and now that they don't block test running there's less harm in
+  making them longer.
+
 ## 0.12.3+5
 
 * Fix a crash when skipping tests because their platforms don't match.
diff --git a/lib/src/runner/browser/browser_manager.dart b/lib/src/runner/browser/browser_manager.dart
index 5518748..0442d82 100644
--- a/lib/src/runner/browser/browser_manager.dart
+++ b/lib/src/runner/browser/browser_manager.dart
@@ -108,7 +108,7 @@
         if (!completer.isCompleted) completer.complete();
       });
 
-      return completer.future.timeout(new Duration(seconds: 15), onTimeout: () {
+      return completer.future.timeout(new Duration(minutes: 1), onTimeout: () {
         throw new LoadException(
             path,
             "Timed out waiting for the test suite to connect on "
diff --git a/lib/src/runner/browser/server.dart b/lib/src/runner/browser/server.dart
index 0740990..1383bb3 100644
--- a/lib/src/runner/browser/server.dart
+++ b/lib/src/runner/browser/server.dart
@@ -446,7 +446,7 @@
       completer.completeError(error, stackTrace);
     });
 
-    return completer.future.timeout(new Duration(seconds: 7), onTimeout: () {
+    return completer.future.timeout(new Duration(seconds: 30), onTimeout: () {
       throw new ApplicationException(
           "Timed out waiting for ${platform.name} to connect.");
     });
diff --git a/pubspec.yaml b/pubspec.yaml
index bf0bbf0..f60e5c3 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: test
-version: 0.12.4-dev
+version: 0.12.3+6
 author: Dart Team <misc@dartlang.org>
 description: A library for writing dart unit tests.
 homepage: https://github.com/dart-lang/test