Revert 59409 - GTTF: Move browser_tests test launcher timeout to chrome/test/test_timeouts

BUG=none
TEST=browser_tests

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

TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/3440002

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

1 files changed, 9 insertions, 0 deletions

diff --git a/chrome/test/in_process_browser_test.h b/chrome/test/in_process_browser_test.h
index 347d19c..0af1877 100644
--- a/chrome/test/in_process_browser_test.h
+++ b/chrome/test/in_process_browser_test.h
@@ -95,6 +95,12 @@ class InProcessBrowserTest : public testing::Test {
   // main thread before the browser is torn down.
   virtual void CleanUpOnMainThread() {}
 
+  // Invoked when a test is not finishing in a timely manner.
+  void TimedOut();
+
+  // Sets Initial Timeout value.
+  void SetInitialTimeoutInMS(int initial_timeout);
+
   // Returns the testing server. Guaranteed to be non-NULL.
   net::TestServer* test_server() { return &test_server_; }
 
@@ -152,6 +158,9 @@ class InProcessBrowserTest : public testing::Test {
   // Saved to restore the value of RenderProcessHost::run_renderer_in_process.
   bool original_single_process_;
 
+  // Initial timeout value in ms.
+  int initial_timeout_;
+
   // Host resolver to use during the test.
   scoped_refptr<net::RuleBasedHostResolverProc> host_resolver_;