summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/tests
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 22:37:31 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 22:37:31 +0000
commitd64295933cbfd3bc984e851412cc79c8a0870acf (patch)
tree8026b726dc498f4fa6f3e886b1612541ac6f0214 /chrome/browser/ui/tests
parent4f2063cce10295e8b982e98d466c9130d754a540 (diff)
downloadchromium_src-d64295933cbfd3bc984e851412cc79c8a0870acf.zip
chromium_src-d64295933cbfd3bc984e851412cc79c8a0870acf.tar.gz
chromium_src-d64295933cbfd3bc984e851412cc79c8a0870acf.tar.bz2
Remove action_max_timeout_ms and fix all the callers.
(This was a TODO for phajdan.jr). BUG=None TEST=trybots Review URL: http://codereview.chromium.org/6354005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/tests')
-rw-r--r--chrome/browser/ui/tests/browser_uitest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/tests/browser_uitest.cc b/chrome/browser/ui/tests/browser_uitest.cc
index 3b9c92c..3320dd4 100644
--- a/chrome/browser/ui/tests/browser_uitest.cc
+++ b/chrome/browser/ui/tests/browser_uitest.cc
@@ -240,7 +240,7 @@ TEST_F(SecurityTest, DisallowFileUrlUniversalAccessTest) {
ASSERT_TRUE(tab->NavigateToURL(url));
std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
- "status", action_max_timeout_ms());
+ "status", TestTimeouts::action_max_timeout_ms());
ASSERT_STREQ("Disallowed", value.c_str());
}