Index: chrome/browser/dom_ui/options/options_ui_uitest.cc |
diff --git a/chrome/browser/dom_ui/options/options_ui_uitest.cc b/chrome/browser/dom_ui/options/options_ui_uitest.cc |
index b6c8bd2d57db94399501d0351edd5af5e88480d4..abc022f75130e2daf2d773d2ea625838feac5733 100644 |
--- a/chrome/browser/dom_ui/options/options_ui_uitest.cc |
+++ b/chrome/browser/dom_ui/options/options_ui_uitest.cc |
@@ -1,10 +1,11 @@ |
-// Copyright (c) 2010 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
#include "app/l10n_util.h" |
#include "base/command_line.h" |
#include "base/string16.h" |
+#include "base/test/test_timeouts.h" |
#include "base/utf_string_conversions.h" |
#include "chrome/app/chrome_command_ids.h" |
#include "chrome/common/chrome_switches.h" |
@@ -92,11 +93,13 @@ TEST_F(OptionsUITest, MAYBE_CommandAgainGoesBackToOptionsTab) { |
// Switch to first tab and run command again. |
ASSERT_TRUE(browser->ActivateTab(0)); |
- ASSERT_TRUE(browser->WaitForTabToBecomeActive(0, action_max_timeout_ms())); |
+ ASSERT_TRUE(browser->WaitForTabToBecomeActive( |
+ 0, TestTimeouts::action_max_timeout_ms())); |
ASSERT_TRUE(browser->RunCommand(IDC_OPTIONS)); |
// Ensure the options ui tab is active. |
- ASSERT_TRUE(browser->WaitForTabToBecomeActive(1, action_max_timeout_ms())); |
+ ASSERT_TRUE(browser->WaitForTabToBecomeActive( |
+ 1, TestTimeouts::action_max_timeout_ms())); |
ASSERT_TRUE(browser->GetTabCount(&tab_count)); |
ASSERT_EQ(2, tab_count); |
} |