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

Unified Diff: chrome/test/selenium/selenium_test.cc

Issue 6188004: Remove test_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/test/page_cycler/page_cycler_test.cc ('k') | chrome/test/ui/dom_checker_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/selenium/selenium_test.cc
diff --git a/chrome/test/selenium/selenium_test.cc b/chrome/test/selenium/selenium_test.cc
index 071272dba62d794e2e65c37de39c83721df2969b..fa173bbe7ae2e4dc41b7ece1b17cf97009b13816 100644
--- a/chrome/test/selenium/selenium_test.cc
+++ b/chrome/test/selenium/selenium_test.cc
@@ -1,4 +1,4 @@
-// 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.
@@ -17,6 +17,7 @@
#include "base/path_service.h"
#include "base/string_split.h"
#include "base/string_util.h"
+#include "base/test/test_timeouts.h"
#include "base/utf_string_conversions.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/test/automation/tab_proxy.h"
@@ -111,8 +112,9 @@ class SeleniumTest : public UITest {
tab->NavigateToURL(test_url);
// Wait for the test to finish.
- ASSERT_TRUE(WaitUntilCookieValue(tab.get(), test_url, "__tests_finished",
- UITest::test_timeout_ms(), "1"));
+ ASSERT_TRUE(WaitUntilCookieValue(
+ tab.get(), test_url, "__tests_finished",
+ TestTimeouts::huge_test_timeout_ms(), "1"));
std::string cookie;
ASSERT_TRUE(tab->GetCookieByName(test_url, "__num_tests_total", &cookie));
« no previous file with comments | « chrome/test/page_cycler/page_cycler_test.cc ('k') | chrome/test/ui/dom_checker_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698