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"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/navigation_entry_impl.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/test/test_render_view_host_factory.h"
 #include "content/test/test_web_contents.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
@@ skipping 42 matching lines @@
     : rph_factory_(new MockRenderProcessHostFactory()),
       rvh_factory_(new TestRenderViewHostFactory(rph_factory_.get())) {
 }
 
 RenderViewHostTestEnabler::~RenderViewHostTestEnabler() {
 }
 
 
 // RenderViewHostTestHarness --------------------------------------------------
 
-RenderViewHostTestHarness::RenderViewHostTestHarness() : contents_(NULL) {
+RenderViewHostTestHarness::RenderViewHostTestHarness()
+  : contents_(NULL),
+    thread_bundle_options_(TestBrowserThreadBundle::DEFAULT) {
 }
 
 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(thread_bundle_options_));
+
 #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();
 
+#if defined(OS_WIN)
+  ole_initializer_.reset();
+#endif
+
   // 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());
-  base::RunLoop().RunUntilIdle();
-
-#if defined(OS_WIN)
-  ole_initializer_.reset();
-#endif
+  // Release the browser context by posting itself on the end of the task
+  // queue. This is preferable to immediate deletion because it will behave
+  // properly if the |rph_factory_| reset above enqueued any tasks which
+  // depend on |browser_context_|.
+  BrowserThread::DeleteSoon(content::BrowserThread::UI,
+                            FROM_HERE,
+                            browser_context_.release());
+  thread_bundle_.reset();
 }
 
 void RenderViewHostTestHarness::SetRenderProcessHostFactory(
     RenderProcessHostFactory* factory) {
     rvh_test_enabler_.rvh_factory_->set_render_process_host_factory(factory);
 }
 
 }  // namespace content