Fix failing checks that enforce an ordering on test timeout values. This ordering is not yet respected by all test runners.

BUG=0
TEST=0
TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/3400010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59683 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 5 deletions

diff --git a/chrome/test/test_timeouts.cc b/chrome/test/test_timeouts.cc
index 5551a92..2f7a1bc 100644
--- a/chrome/test/test_timeouts.cc
+++ b/chrome/test/test_timeouts.cc
@@ -54,16 +54,20 @@ void TestTimeouts::Initialize() {
   }
   initialized_ = true;
 
+  // The timeout values should be increasing in the right order, and while
+  // initially they are, overrides may not respect this. Move the checks to
+  // before the point at which they get overridden while all build scripts
+  // are updated.
+  // TODO(robertshield): Move these checks back once the bots are updated.
+  CHECK(action_timeout_ms_ <= action_max_timeout_ms_);
+  CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_);
+  CHECK(large_test_timeout_ms_ <= huge_test_timeout_ms_);
+
   InitializeTimeout(switches::kUiTestActionTimeout, &action_timeout_ms_);
   InitializeTimeout(switches::kUiTestActionMaxTimeout, &action_max_timeout_ms_);
   InitializeTimeout(switches::kTestLargeTimeout, &large_test_timeout_ms_);
   InitializeTimeout(switches::kUiTestTimeout, &huge_test_timeout_ms_);
 
-  // The timeout values should be increasing in the right order.
-  CHECK(action_timeout_ms_ <= action_max_timeout_ms_);
-  CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_);
-  CHECK(large_test_timeout_ms_ <= huge_test_timeout_ms_);
-
   InitializeTimeout(switches::kUiTestSleepTimeout, &sleep_timeout_ms_);
   InitializeTimeout(switches::kUiTestCommandExecutionTimeout,
                     &command_execution_timeout_ms_);