Remove action_max_timeout_ms and fix all the callers.

chrome/test/interactive_ui/mouseleave_interactive_uitest.cc

-// 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"
 #include "chrome/test/ui/ui_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
@@ skipping 35 matching lines @@
   gfx::Point above_content_point(
       tab_view_bounds.x() + tab_view_bounds.width() / 2,
       tab_view_bounds.y() - 2);
 
   // Start by moving the point just above the content.
   ASSERT_TRUE(window->SimulateOSMouseMove(above_content_point));
 
   // 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 timeout from TestTimeout that
is roughly 5 times longer than action_max_timeout_ms() and use it instead?

[tfarina, 2011/01/17 12:14:46]

The closest is live_operation_timeout_ms(), which is 45000 (but
action_max_timeout_ms is 15000). I will use it instead, unless you are against.

[Paweł Hajdan Jr., 2011/01/17 14:58:03]

No, live_operation_timeout is meant for code that touches the internet. Let's
use large_test_timeout here. It's three minutes, but should be fine.

[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.
   ASSERT_TRUE(WaitUntilCookieValue(
       tab.get(), test_url, "__state", timeout_ms, "initial"));
 
   // Move the cursor to the top-center of the content, which will trigger
   // a javascript onMouseOver event.
   ASSERT_TRUE(window->SimulateOSMouseMove(in_content_point));
 
   // Wait on the correct intermediate value of the cookie.
   ASSERT_TRUE(WaitUntilCookieValue(
       tab.get(), test_url, "__state", timeout_ms, "initial,entered"));
 
   // Move the cursor above the content again, which should trigger
   // a javascript onMouseOut event.
   ASSERT_TRUE(window->SimulateOSMouseMove(above_content_point));
 
   // Wait on the correct final value of the cookie.
   ASSERT_TRUE(WaitUntilCookieValue(
       tab.get(), test_url, "__state", timeout_ms, "initial,entered,left"));
 }
 
 }  // namespace