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

Unified Diff: chrome/test/url_fetch_test/url_fetch_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/ui/v8_benchmark_uitest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/url_fetch_test/url_fetch_test.cc
diff --git a/chrome/test/url_fetch_test/url_fetch_test.cc b/chrome/test/url_fetch_test/url_fetch_test.cc
index 98ea5088e6074c82493d16efb39411ca02dbf1d4..d1efc5b61a8f38565e17e2db15417708fb32ee9a 100644
--- a/chrome/test/url_fetch_test/url_fetch_test.cc
+++ b/chrome/test/url_fetch_test/url_fetch_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.
@@ -7,6 +7,7 @@
#include "base/file_util.h"
#include "base/path_service.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"
@@ -53,13 +54,15 @@ class UrlFetchTest : public UITest {
if (wait_cookie_name) {
if (wait_cookie_value) {
- bool completed = WaitUntilCookieValue(tab.get(), url, wait_cookie_name,
- UITest::test_timeout_ms(),
- wait_cookie_value);
+ bool completed = WaitUntilCookieValue(
+ tab.get(), url, wait_cookie_name,
+ TestTimeouts::huge_test_timeout_ms(),
+ wait_cookie_value);
ASSERT_TRUE(completed);
} else {
result->cookie_value = WaitUntilCookieNonEmpty(
- tab.get(), url, wait_cookie_name, UITest::test_timeout_ms());
+ tab.get(), url, wait_cookie_name,
+ TestTimeouts::huge_test_timeout_ms());
ASSERT_TRUE(result->cookie_value.length());
}
}
« no previous file with comments | « chrome/test/ui/v8_benchmark_uitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698