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

Unified Diff: chrome/test/interactive_ui/mouseleave_interactive_uitest.cc

Issue 6354005: Remove action_max_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
Index: chrome/test/interactive_ui/mouseleave_interactive_uitest.cc
diff --git a/chrome/test/interactive_ui/mouseleave_interactive_uitest.cc b/chrome/test/interactive_ui/mouseleave_interactive_uitest.cc
index 627e25ec1617e2b7316bbffb7aa1a3d9f286c0e4..039ade775c6c287ec87285cfe90b3ce9619eafaa 100644
--- a/chrome/test/interactive_ui/mouseleave_interactive_uitest.cc
+++ b/chrome/test/interactive_ui/mouseleave_interactive_uitest.cc
@@ -1,8 +1,9 @@
-// Copyright (c) 2009 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.
#include "base/file_path.h"
+#include "base/test/test_timeouts.h"
#include "chrome/test/automation/browser_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/automation/window_proxy.h"
@@ -58,7 +59,7 @@ TEST_F(MouseLeaveTest, MAYBE_TestOnMouseOut) {
// Navigate to the test html page.
ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(test_url));
- const int timeout_ms = 5 * action_max_timeout_ms();
+ const int timeout_ms = 5 * TestTimeouts::action_max_timeout_ms();
Paweł Hajdan Jr. 2011/01/17 08:19:32 Ouch, this multiplication is bad. Could you find a
tfarina 2011/01/17 12:14:46 The closest is live_operation_timeout_ms(), which
Paweł Hajdan Jr. 2011/01/17 14:58:03 No, live_operation_timeout is meant for code that
tfarina 2011/01/19 12:30:40 Done.
// Wait for the onload() handler to complete so we can do the
// next part of the test.

Powered by Google App Engine
This is Rietveld 408576698