| Index: base/test/test_timeouts.cc | 
| diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc | 
| index 7ee1b706d9482885a901fcc30fe27ab52acfed26..046f3209230c384939fccef860c087cda5fea8d2 100644 | 
| --- a/base/test/test_timeouts.cc | 
| +++ b/base/test/test_timeouts.cc | 
| @@ -42,6 +42,7 @@ bool TestTimeouts::initialized_ = false; | 
|  | 
| // The timeout values should increase in the order they appear in this block. | 
| // static | 
| +int TestTimeouts::tiny_timeout_ms_ = 100; | 
| int TestTimeouts::action_timeout_ms_ = 2000; | 
| int TestTimeouts::action_max_timeout_ms_ = 15000; | 
| int TestTimeouts::large_test_timeout_ms_ = 3 * 60 * 1000; | 
| @@ -66,7 +67,9 @@ void TestTimeouts::Initialize() { | 
|  | 
| // Note that these timeouts MUST be initialized in the correct order as | 
| // per the CHECKS below. | 
| -  InitializeTimeout(switches::kUiTestActionTimeout, &action_timeout_ms_); | 
| +  InitializeTimeout(switches::kTestTinyTimeout, &tiny_timeout_ms_); | 
| +  InitializeTimeout(switches::kUiTestActionTimeout, tiny_timeout_ms_, | 
| +                    &action_timeout_ms_); | 
| InitializeTimeout(switches::kUiTestActionMaxTimeout, action_timeout_ms_, | 
| &action_max_timeout_ms_); | 
| InitializeTimeout(switches::kTestLargeTimeout, action_max_timeout_ms_, | 
| @@ -75,6 +78,7 @@ void TestTimeouts::Initialize() { | 
| &huge_test_timeout_ms_); | 
|  | 
| // The timeout values should be increasing in the right order. | 
| +  CHECK(tiny_timeout_ms_ <= action_timeout_ms_); | 
| 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_); | 
|  |