Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Unified Diff: chrome/test/automated_ui_tests/automated_ui_test_base.cc

Issue 6282002: Remove action_timeout_ms and fix all the callers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/tab_restore_uitest.cc ('k') | chrome/test/ui/npapi_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/automated_ui_tests/automated_ui_test_base.cc
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_base.cc b/chrome/test/automated_ui_tests/automated_ui_test_base.cc
index 6b6d388a0c3c2bff460034bc84f9410fdcdce6d1..84f97f8c8dd49620562e6fd079c82e997cd2c487 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_base.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_test_base.cc
@@ -1,7 +1,8 @@
-// Copyright (c) 2009 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 "base/test/test_timeouts.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/ui/view_ids.h"
#include "chrome/test/automated_ui_tests/automated_ui_test_base.h"
@@ -212,7 +213,8 @@ bool AutomatedUITestBase::DragActiveTab(bool drag_right) {
return false;
}
- if (!browser->WaitForTabToBecomeActive(new_tab_index, action_timeout_ms())) {
+ if (!browser->WaitForTabToBecomeActive(new_tab_index,
+ TestTimeouts::action_timeout_ms())) {
LogWarningMessage("failed_to_reindex_tab");
return false;
}
« no previous file with comments | « chrome/browser/tab_restore_uitest.cc ('k') | chrome/test/ui/npapi_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698