Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/prerender/prerender_resource_throttle_unittest.cc

Index: chrome/browser/prerender/prerender_resource_throttle_unittest.cc
diff --git a/chrome/browser/prerender/prerender_resource_throttle_unittest.cc b/chrome/browser/prerender/prerender_resource_throttle_unittest.cc
index 7726902c50a47c47fc24a11572798ff9477e8e7c..eaac1d5a18edf51a563cc5c07f6b293f171fb6ed 100644
--- a/chrome/browser/prerender/prerender_resource_throttle_unittest.cc
+++ b/chrome/browser/prerender/prerender_resource_throttle_unittest.cc
@@ -8,7 +8,6 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/net/url_request_mock_util.h"
@@ -20,6 +19,7 @@
 #include "content/public/browser/resource_throttle.h"
 #include "content/public/common/previews_state.h"
 #include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "ipc/ipc_message.h"
 #include "net/base/request_priority.h"
 #include "net/test/url_request/url_request_mock_http_job.h"
@@ -166,10 +166,10 @@ class PrerenderResourceThrottleTest : public testing::Test {
   static const int kDefaultChildId = 0;
   static const int kDefaultRouteId = 100;
 
-  PrerenderResourceThrottleTest() :
-      ui_thread_(BrowserThread::UI, &message_loop_),
-      io_thread_(BrowserThread::IO, &message_loop_),
-      test_contents_(&prerender_manager_, kDefaultChildId, kDefaultRouteId) {
+  PrerenderResourceThrottleTest()
+      : test_browser_thread_bundle_(
+            content::TestBrowserThreadBundle::IO_MAINLOOP),
+        test_contents_(&prerender_manager_, kDefaultChildId, kDefaultRouteId) {
     chrome_browser_net::SetUrlRequestMocksEnabled(true);
   }
 
@@ -194,9 +194,7 @@ class PrerenderResourceThrottleTest : public testing::Test {
   void RunEvents() { base::RunLoop().RunUntilIdle(); }
 
  private:
-  base::MessageLoopForIO message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread io_thread_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
 
   TestPrerenderManager prerender_manager_;
   TestPrerenderContents test_contents_;