[GTTF] Remove the internal timeout of extension browser tests.

Now we have a global timeout for browser tests enforced by
out of process test launcher.

Having too many different timeouts all over the place makes
debugging issues harder.

TEST=browser_tests
BUG=none

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

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

2 files changed, 3 insertions, 7 deletions

diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index b2b2258..c93ec1c 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -544,12 +544,9 @@ int FindInPage(TabContents* tab_contents, const string16& search_string,
 }
 
 void RegisterAndWait(NotificationType::Type type,
-                     NotificationObserver* observer,
-                     int64 timeout_ms) {
+                     NotificationObserver* observer) {
   NotificationRegistrar registrar;
   registrar.Add(observer, type, NotificationService::AllSources());
-  MessageLoop::current()->PostDelayedTask(
-      FROM_HERE, new MessageLoop::QuitTask, timeout_ms);
   RunMessageLoop();
 }
 
diff --git a/chrome/test/ui_test_utils.h b/chrome/test/ui_test_utils.h
index 3d8cd14..68e7103 100644
--- a/chrome/test/ui_test_utils.h
+++ b/chrome/test/ui_test_utils.h
@@ -152,10 +152,9 @@ bool IsViewFocused(const Browser* browser, ViewID vid);
 void ClickOnView(const Browser* browser, ViewID vid);
 
 // Register |observer| for the given |type| and run the message loop until
-// either the observer posts a quit task or we timeout.
+// the observer posts a quit task.
 void RegisterAndWait(NotificationType::Type type,
-                     NotificationObserver* observer,
-                     int64 timeout_ms);
+                     NotificationObserver* observer);
 
 // Run a message loop only for the specified amount of time.
 class TimedMessageLoopRunner {