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

Unified Diff: chrome/test/perf/url_fetch_test.cc

Issue 10787010: Switch to TimeDelta interfaces in chrome automation test infrastructure. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase onto master. Created 8 years, 5 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/perf/tab_switching_test.cc ('k') | chrome/test/perf/v8_benchmark_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/perf/url_fetch_test.cc
diff --git a/chrome/test/perf/url_fetch_test.cc b/chrome/test/perf/url_fetch_test.cc
index faa2c4fb2e131c55198b89c66e86420be1c2337a..cf19e9bbf21feba64717ae9868fe2b00821b33ba 100644
--- a/chrome/test/perf/url_fetch_test.cc
+++ b/chrome/test/perf/url_fetch_test.cc
@@ -45,7 +45,7 @@ class UrlFetchTest : public UIPerfTest {
const char* var_to_fetch,
const std::string& wait_js_expr,
const std::string& wait_js_frame_xpath,
- int wait_js_timeout_ms,
+ base::TimeDelta wait_js_timeout,
UrlFetchTestResult* result) {
scoped_refptr<TabProxy> tab(GetActiveTab());
ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(url));
@@ -54,13 +54,13 @@ class UrlFetchTest : public UIPerfTest {
if (wait_cookie_value) {
bool completed = WaitUntilCookieValue(
tab.get(), url, wait_cookie_name,
- TestTimeouts::large_test_timeout_ms(),
+ TestTimeouts::large_test_timeout(),
wait_cookie_value);
ASSERT_TRUE(completed);
} else {
result->cookie_value = WaitUntilCookieNonEmpty(
tab.get(), url, wait_cookie_name,
- TestTimeouts::large_test_timeout_ms());
+ TestTimeouts::large_test_timeout());
ASSERT_TRUE(result->cookie_value.length());
}
} else if (!wait_js_expr.empty()) {
@@ -68,7 +68,7 @@ class UrlFetchTest : public UIPerfTest {
tab.get(),
UTF8ToWide(wait_js_frame_xpath),
UTF8ToWide(wait_js_expr),
- wait_js_timeout_ms);
+ wait_js_timeout);
ASSERT_TRUE(completed);
}
if (var_to_fetch) {
@@ -161,7 +161,7 @@ TEST_F(UrlFetchTest, UrlFetch) {
jsvar.length() > 0 ? jsvar.c_str() : NULL,
js_expr,
js_frame_xpath,
- js_timeout_ms,
+ base::TimeDelta::FromMilliseconds(js_timeout_ms),
&result);
// Write out the cookie if requested
« no previous file with comments | « chrome/test/perf/tab_switching_test.cc ('k') | chrome/test/perf/v8_benchmark_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698