Fix bad merge in refactoring

tools/testing/dart/command_output.dart

 // Copyright (c) 2017, 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.
 
 import 'dart:convert';
 // We need to use the 'io' prefix here, otherwise io.exitCode will shadow
 // CommandOutput.exitCode in subclasses of CommandOutput.
 import 'dart:io' as io;
 
 import 'browser_controller.dart';
@@ skipping 494 matching lines @@
 
   BrowserCommandOutputImpl._internal(Command command, BrowserTestOutput result,
       this._rawOutcome, List<int> stdout, List<int> stderr)
       : super(command, 0, result.didTimeout, stdout, stderr, result.duration,
             false, 0) {
     _result = result;
   }
 
   Expectation result(TestCase testCase) {
     // Handle timeouts first
-    if (_result.didTimeout) return Expectation.timeout;
     if (_result.didTimeout) {
       if (testCase.configuration.runtime == Runtime.ie11) {
         // TODO(28955): See http://dartbug.com/28955
         DebugLogger.warning("Timeout of ie11 on test ${testCase.displayName}");
         return Expectation.ignore;
       }
       return Expectation.timeout;
     }
 
     if (hasNonUtf8) return Expectation.nonUtf8Error;
@@ skipping 375 matching lines @@
     // complete successfully, it's outcome is Expectation.FAIL.
     // TODO: maybe we should introduce a AsyncIncomplete marker or so
     if (outcome == Expectation.pass) {
       if (_isAsyncTest(testOutput) && !_isAsyncTestSuccessful(testOutput)) {
         return Expectation.fail;
       }
     }
     return outcome;
   }
 }