diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser_uitest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/bookmarks_ui_uitest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/in_process_webkit/dom_storage_uitest.cc | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc index f22c32b..11a613fb 100644 --- a/chrome/browser/browser_uitest.cc +++ b/chrome/browser/browser_uitest.cc @@ -231,7 +231,7 @@ TEST_F(SecurityTest, DisallowFileUrlUniversalAccessTest) { ASSERT_TRUE(tab->NavigateToURL(url)); std::string value = WaitUntilCookieNonEmpty(tab.get(), url, - "status", sleep_timeout_ms(), action_max_timeout_ms()); + "status", action_max_timeout_ms()); ASSERT_STREQ("Disallowed", value.c_str()); } diff --git a/chrome/browser/dom_ui/bookmarks_ui_uitest.cc b/chrome/browser/dom_ui/bookmarks_ui_uitest.cc index 774495a..70552c9 100644 --- a/chrome/browser/dom_ui/bookmarks_ui_uitest.cc +++ b/chrome/browser/dom_ui/bookmarks_ui_uitest.cc @@ -21,7 +21,7 @@ class BookmarksUITest : public UITest { L"domAutomationController.send(" L" location.protocol == 'chrome-extension:' && " L" document.readyState == 'complete')", - 100, UITest::test_timeout_ms()); + UITest::test_timeout_ms()); } scoped_refptr<TabProxy> GetBookmarksUITab() { diff --git a/chrome/browser/in_process_webkit/dom_storage_uitest.cc b/chrome/browser/in_process_webkit/dom_storage_uitest.cc index d3f97f6..2da6e66 100644 --- a/chrome/browser/in_process_webkit/dom_storage_uitest.cc +++ b/chrome/browser/in_process_webkit/dom_storage_uitest.cc @@ -72,8 +72,7 @@ class DOMStorageTest : public UILayoutTest { ASSERT_TRUE(tab->SetCookie(url, "")); ASSERT_TRUE(tab->NavigateToURL(url)); - WaitUntilCookieNonEmpty(tab.get(), url, "cleared", kTestIntervalMs, - action_max_timeout_ms()); + WaitUntilCookieNonEmpty(tab.get(), url, "cleared", action_max_timeout_ms()); } // Runs each test in an array of strings until it hits a NULL. |