Revert r37983, "Add periodic browser restart to ContentShellOnAndroid test runtime. Update test st…

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 fbe6c106ad5d42c3fe1fedbd568468355ee4494e..1f438453a81034c3170d596de6b4534b1aba56dd 100644
--- a/tools/testing/dart/browser_controller.dart
+++ b/tools/testing/dart/browser_controller.dart
@@ -745,7 +745,6 @@ class BrowserTestingStatus {
   BrowserTest lastTest;
   bool timeout = false;
   Timer nextTestTimeout;
-  Stopwatch timeSinceRestart = new Stopwatch();
 
   BrowserTestingStatus(Browser this.browser);
 }
@@ -803,7 +802,6 @@ class BrowserTestOutput {
 class BrowserTestRunner {
   static const int MAX_NEXT_TEST_TIMEOUTS = 10;
   static const Duration NEXT_TEST_TIMEOUT = const Duration(seconds: 60);
-  static const Duration RESTART_BROWSER_INTERVAL = const Duration(seconds: 60);
 
   final Map globalConfiguration;
   final bool checkedMode; // needed for dartium
@@ -866,7 +864,6 @@ class BrowserTestRunner {
               var status = new BrowserTestingStatus(browser);
               browserStatus[browser.id] = status;
               status.nextTestTimeout = createNextTestTimer(status);
-              status.timeSinceRestart.start();
             }
             return success;
           });
@@ -1051,7 +1048,6 @@ class BrowserTestRunner {
     var status = new BrowserTestingStatus(browser);
     browserStatus[new_id] = status;
     status.nextTestTimeout = createNextTestTimer(status);
-    status.timeSinceRestart.start();
     browser.start(testingServer.getDriverUrl(new_id)).then((success) {
       // We may have started terminating in the mean time.
       if (underTermination) {
@@ -1087,22 +1083,6 @@ class BrowserTestRunner {
     // We are currently terminating this browser, don't start a new test.
     if (status.timeout) return null;
 
-    // Restart content_shell and dartium on Android if they have been
-    // running for longer than RESTART_BROWSER_INTERVAL. The tests have
-    // had flaky timeouts, and this may help.
-    if ((browserName == 'ContentShellOnAndroid' ||
-         browserName == 'DartiumOnAndroid' ) &&
-        status.timeSinceRestart.elapsed > RESTART_BROWSER_INTERVAL) {
-      var id = status.browser.id;
-      status.browser.close().then((_) {
-        // We don't want to start a new browser if we are terminating.
-        if (underTermination) return;
-        restartBrowser(id);
-      });
-      // Don't send a test to the browser we are restarting.
-      return null;
-    }
-
     BrowserTest test = testQueue.removeLast();
     if (status.currentTest == null) {
       status.currentTest = test;