diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 22:10:01 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 22:10:01 +0000 |
commit | a0e790507d6ba0d895b38f2d25524557ebeed9a3 (patch) | |
tree | e06e606726cb54ae64e780d85cdf0b7391e156f9 /chrome/test/in_process_browser_test.h | |
parent | 03bc1c07f85e16fd32ee9e4bfec44998f44f998b (diff) | |
download | chromium_src-a0e790507d6ba0d895b38f2d25524557ebeed9a3.zip chromium_src-a0e790507d6ba0d895b38f2d25524557ebeed9a3.tar.gz chromium_src-a0e790507d6ba0d895b38f2d25524557ebeed9a3.tar.bz2 |
Revert 44004 - Changes browser_tests to not run a nested message loop.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1513014
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/1558033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44012 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/in_process_browser_test.h')
-rw-r--r-- | chrome/test/in_process_browser_test.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/chrome/test/in_process_browser_test.h b/chrome/test/in_process_browser_test.h index d23b884..6e922d9 100644 --- a/chrome/test/in_process_browser_test.h +++ b/chrome/test/in_process_browser_test.h @@ -115,21 +115,10 @@ class InProcessBrowserTest : public testing::Test { void EnableSingleProcess() { single_process_ = true; } private: -#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. + // Invokes CreateBrowser to create a browser, then RunTestOnMainThread, and + // destroys the browser. void RunTestOnMainThreadLoop(); - // Quits all open browsers and waits until there are no more browsers. - void QuitBrowsers(); - // Browser created from CreateBrowser. Browser* browser_; |