Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

content/public/test/test_renderer_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/test_renderer_host.h"
 
 #include "base/run_loop.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
@@ skipping 54 matching lines @@
     : rph_factory_(new MockRenderProcessHostFactory()),
       rvh_factory_(new TestRenderViewHostFactory(rph_factory_.get())) {
 }
 
 RenderViewHostTestEnabler::~RenderViewHostTestEnabler() {
 }
 
 
 // RenderViewHostTestHarness --------------------------------------------------
 
-RenderViewHostTestHarness::RenderViewHostTestHarness() : contents_(NULL) {
+RenderViewHostTestHarness::RenderViewHostTestHarness()
+  : contents_(NULL),
+    real_threads_mask_(TestBrowserThreadBundle::NO_REAL_THREAD) {
 }
 
 RenderViewHostTestHarness::~RenderViewHostTestHarness() {
 }
 
 NavigationController& RenderViewHostTestHarness::controller() {
   return web_contents()->GetController();
 }
 
 WebContents* RenderViewHostTestHarness::web_contents() {
@@ skipping 62 matching lines @@
 
 void RenderViewHostTestHarness::FailedReload() {
   NavigationEntry* entry = controller().GetLastCommittedEntry();
   DCHECK(entry);
   controller().Reload(false);
   static_cast<TestRenderViewHost*>(
       rvh())->SendFailedNavigate(entry->GetPageID(), entry->GetURL());
 }
 
 void RenderViewHostTestHarness::SetUp() {
+  thread_bundle_.reset(new TestBrowserThreadBundle(real_threads_mask_));
+
 #if defined(OS_WIN)
   ole_initializer_.reset(new ui::ScopedOleInitializer());
 #endif
 #if defined(USE_AURA)
-  aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
+  aura_test_helper_.reset(
+      new aura::test::AuraTestHelper(base::MessageLoopForUI::current()));
   aura_test_helper_->SetUp();
 #endif
   SetContents(CreateTestWebContents());
 }
 
 void RenderViewHostTestHarness::TearDown() {
   SetContents(NULL);
 #if defined(USE_AURA)
   aura_test_helper_->TearDown();
 #endif
   // Make sure that we flush any messages related to WebContentsImpl destruction
   // before we destroy the browser context.
   base::RunLoop().RunUntilIdle();
 
   // Delete any RenderProcessHosts before the BrowserContext goes away.
   if (rvh_test_enabler_.rph_factory_)
     rvh_test_enabler_.rph_factory_.reset();
 
   // Release the browser context on the UI thread.
-  message_loop_.DeleteSoon(FROM_HERE, browser_context_.release());
+  BrowserThread::PostTask(content::BrowserThread::UI,

[Jeffrey Yasskin, 2013/05/22 22:24:58]

BrowserThread::DeleteSoon exists.

[awong, 2013/05/24 23:39:28]

Done.

+                          FROM_HERE,
+                          base::Bind(&base::DeletePointer<BrowserContext>,
+                                     browser_context_.release()));
   base::RunLoop().RunUntilIdle();

[Jeffrey Yasskin, 2013/05/22 22:24:58]

You can remove this line, I think.

[awong, 2013/05/24 23:39:28]

I'm not certain I can.  What if the browser_context_ posts tasks on deletion
that need ole_initializer_?

[Jeffrey Yasskin, 2013/05/27 03:12:13]

Ew. Good point. Would it be better to reset the thread_bundle_ before the
ole_initializer_, or can the ole_initializer use the threads?

[awong, 2013/05/30 21:46:09]

Per IRC conversation with cpu@, requiring OLE during teardown is already a no-no
since you aren't going to be able to sanely handle a drag'n'drop if half the
system is gone.

Moving the reset up before the rph_factory_.reset() and removing this
RunUntilIdle().  Now we only drain the loop twice during TearDown (one
explicitly, and one via the thread_bundle_.reset()).

 
 #if defined(OS_WIN)
   ole_initializer_.reset();
 #endif
+  thread_bundle_.reset();
 }
 
 void RenderViewHostTestHarness::SetRenderProcessHostFactory(
     RenderProcessHostFactory* factory) {
     rvh_test_enabler_.rvh_factory_->set_render_process_host_factory(factory);
 }
 
 }  // namespace content