Changes browser_tests to not run a nested message loop.

BUG=none
TEST=none

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

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

1 files changed, 13 insertions, 2 deletions

diff --git a/chrome/test/in_process_browser_test.h b/chrome/test/in_process_browser_test.h
index 6e922d9..d23b884 100644
--- a/chrome/test/in_process_browser_test.h
+++ b/chrome/test/in_process_browser_test.h
@@ -115,10 +115,21 @@ class InProcessBrowserTest : public testing::Test {
   void EnableSingleProcess() { single_process_ = true; }
 
  private:
-  // Invokes CreateBrowser to create a browser, then RunTestOnMainThread, and
-  // destroys the browser.
+#if defined(OS_MACOSX)
+  // Old variant of RunTestOnMainThreadLoop that assumes a nested message loop.
+  // TODO(sky): nuke this once we straighten out properly exiting on the mac
+  // side.
+  void RunTestOnMainThreadLoopDeprecated();
+#endif
+
+  // This is invoked from main after browser_init/browser_main have completed.
+  // This prepares for the test by creating a new browser, runs the test
+  // (RunTestOnMainThread), quits the browsers and returns.
   void RunTestOnMainThreadLoop();
 
+  // Quits all open browsers and waits until there are no more browsers.
+  void QuitBrowsers();
+
   // Browser created from CreateBrowser.
   Browser* browser_;