[GTTF] Tests cleanup:

- use timeouts correctly
- use more automation methods to make test code more clear
- use more reliable ways of waiting
- remove unnecessary automation calls

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/1553016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43932 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 4 deletions

diff --git a/chrome/test/interactive_ui/keyboard_access_uitest.cc b/chrome/test/interactive_ui/keyboard_access_uitest.cc
index f5c339e..bb8756a 100644
--- a/chrome/test/interactive_ui/keyboard_access_uitest.cc
+++ b/chrome/test/interactive_ui/keyboard_access_uitest.cc
@@ -84,7 +84,7 @@ void KeyboardAccessTest::TestMenuKeyboardAccess(bool alternate_key_sequence) {
   ASSERT_TRUE(window->SimulateOSKeyPress(base::VKEY_RETURN, 0));
 
   // Wait for the new tab to appear.
-  ASSERT_TRUE(browser->WaitForTabCountToBecome(2, sleep_timeout_ms()));
+  ASSERT_TRUE(browser->WaitForTabCountToBecome(2, action_timeout_ms()));
 
   // Make sure that the new tab index is 1.
   ASSERT_TRUE(browser->GetActiveTabIndex(&tab_index));
diff --git a/chrome/test/interactive_ui/npapi_interactive_test.cc b/chrome/test/interactive_ui/npapi_interactive_test.cc
index 3f6ca97..187e04b 100644
--- a/chrome/test/interactive_ui/npapi_interactive_test.cc
+++ b/chrome/test/interactive_ui/npapi_interactive_test.cc
@@ -41,7 +41,6 @@
 
 const char kTestCompleteCookie[] = "status";
 const char kTestCompleteSuccess[] = "OK";
-const int kShortWaitTimeout = 5 * 1000;
 
 // Tests if a plugin executing a self deleting script in the context of
 // a synchronous mousemove works correctly
@@ -77,7 +76,7 @@ TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInvokeInSynchronousMouseMove) {
 
     WaitForFinish("execute_script_delete_in_mouse_move", "1", url,
                   kTestCompleteCookie, kTestCompleteSuccess,
-                  kShortWaitTimeout);
+                  action_max_timeout_ms());
   }
 }
 
@@ -98,5 +97,5 @@ TEST_F(NPAPIVisiblePluginTester, GetURLRequest404Response) {
   ASSERT_TRUE(window->SimulateOSKeyPress(base::VKEY_ESCAPE, 0));
 
   WaitForFinish("geturl_404_response", "1", url, kTestCompleteCookie,
-                kTestCompleteSuccess, kShortWaitTimeout);
+                kTestCompleteSuccess, action_max_timeout_ms());
 }