Index: headless/test/headless_browser_test.cc |
diff --git a/headless/test/headless_browser_test.cc b/headless/test/headless_browser_test.cc |
index 714a00f6d0dbf6d9b2452f9c9f4b7a19ef1c15e5..1ad15d8077653c8302b77df83b336575ae76fb8b 100644 |
--- a/headless/test/headless_browser_test.cc |
+++ b/headless/test/headless_browser_test.cc |
@@ -137,22 +137,15 @@ HeadlessBrowserTest::HeadlessBrowserTest() { |
HeadlessBrowserTest::~HeadlessBrowserTest() {} |
-void HeadlessBrowserTest::SetUpOnMainThread() {} |
- |
-void HeadlessBrowserTest::TearDownOnMainThread() { |
- browser()->Shutdown(); |
-} |
- |
-void HeadlessBrowserTest::RunTestOnMainThreadLoop() { |
+void HeadlessBrowserTest::PreRunTestOnMainThread() { |
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
// Pump startup related events. |
base::RunLoop().RunUntilIdle(); |
+} |
- SetUpOnMainThread(); |
- RunTestOnMainThread(); |
- TearDownOnMainThread(); |
- |
+void HeadlessBrowserTest::PostRunTestOnMainThread() { |
+ browser()->Shutdown(); |
for (content::RenderProcessHost::iterator i( |
content::RenderProcessHost::AllHostsIterator()); |
!i.IsAtEnd(); i.Advance()) { |