Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads.

content/public/test/test_renderer_host.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_
 #define CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/common/page_transition_types.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/test/aura_test_helper.h"
 #endif
 
 namespace aura {
 namespace test {
 class AuraTestHelper;
 }
@@ skipping 126 matching lines @@
 
   // Simulates a reload of the current page.
   void Reload();
   void FailedReload();
 
  protected:
   // testing::Test
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
+  // Configures when TestBrowserThreads inside |thread_bundle| are backed by

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

s/when/which/?

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

Done.

+  // real threads. Must be called before SetUp().
+  void SetRealThreadMask(int real_threads_mask) {
+    DCHECK(thread_bundle_.get() == NULL);
+    real_threads_mask_ = real_threads_mask;
+  }
+
+  TestBrowserThreadBundle* thread_bundle() { return thread_bundle_.get(); }
+
 #if defined(USE_AURA)
   aura::RootWindow* root_window() { return aura_test_helper_->root_window(); }
 #endif
 
   // Replaces the RPH being used.
   void SetRenderProcessHostFactory(RenderProcessHostFactory* factory);
 
   // This browser context will be created in SetUp if it has not already been
   // created.  This allows tests to override the browser context if they so
   // choose in their own SetUp function before calling the base class's (us)
   // SetUp().
   scoped_ptr<BrowserContext> browser_context_;
 
-  base::MessageLoopForUI message_loop_;
-
  private:
   // It is important not to use this directly in the implementation as
   // web_contents() and SetContents() are virtual and may be
   // overridden by subclasses.
   scoped_ptr<WebContents> contents_;
 #if defined(OS_WIN)
   scoped_ptr<ui::ScopedOleInitializer> ole_initializer_;
 #endif
 #if defined(USE_AURA)
   scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
 #endif
   RenderViewHostTestEnabler rvh_test_enabler_;
 
+  int real_threads_mask_;
+  scoped_ptr<TestBrowserThreadBundle> thread_bundle_;
+
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_