[GTTF] Reduce number of automation methods ending with WithTimeout.

They are just too easy to misuse. People started inventing their own
hardcoded timeouts all over the place.

Also, the is_timeout return parameter was not checked consistently.

Additionally, some calls actually had no timeout at all, making
hangs possible.

This change also removes useless DLOG statements. We should get the
required info from the ASSERT/EXPECT macros in test code, which is
quite well checked by WARN_UNUSED_RESULT.

TEST=all ui-based
BUG=none

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

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

1 files changed, 2 insertions, 11 deletions

diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h
index 8fe9318..15b5ab9 100644
--- a/chrome/test/automation/tab_proxy.h
+++ b/chrome/test/automation/tab_proxy.h
@@ -124,14 +124,6 @@ class TabProxy : public AutomationResourceProxy {
       NavigateToURLBlockUntilNavigationsComplete(
           const GURL& url, int number_of_navigations) WARN_UNUSED_RESULT;
 
-  // Navigates to a url. This is same as NavigateToURL with a timeout option.
-  // The function blocks until the |number_of_navigations| navigations
-  // completes or timeout (in milliseconds) occurs. If return after timeout,
-  // is_timeout is set to true.
-  AutomationMsg_NavigationResponseValues NavigateToURLWithTimeout(
-      const GURL& url, int number_of_navigations, uint32 timeout_ms,
-      bool* is_timeout) WARN_UNUSED_RESULT;
-
   // Navigates to a url in an externally hosted tab.
   // This method accepts the same kinds of URL input that
   // can be passed to Chrome on the command line. This is a synchronous call and
@@ -269,9 +261,8 @@ class TabProxy : public AutomationResourceProxy {
   bool GetDownloadDirectory(FilePath* download_directory) WARN_UNUSED_RESULT;
 
   // Shows an interstitial page.  Blocks until the interstitial page
-  // has been loaded. Return false if a failure happens.3
-  bool ShowInterstitialPage(const std::string& html_text,
-                            int timeout_ms) WARN_UNUSED_RESULT;
+  // has been loaded. Return false if a failure happens.
+  bool ShowInterstitialPage(const std::string& html_text) WARN_UNUSED_RESULT;
 
   // Hides the currently shown interstitial page. Blocks until the interstitial
   // page has been hidden. Return false if a failure happens.