Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/prerender/prerender_resource_throttle_unittest.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 <set>
 #include <utility>
 
 #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"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_resource_throttle.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "content/public/browser/resource_request_info.h"
 #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"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
@@ skipping 126 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(DeferredRedirectDelegate);
 };
 
 }  // namespace
 
 class PrerenderResourceThrottleTest : public testing::Test {
  public:
   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);
   }
 
   ~PrerenderResourceThrottleTest() override {
     chrome_browser_net::SetUrlRequestMocksEnabled(false);
 
     // Cleanup work so the file IO tasks from URLRequestMockHTTPJob
     // are gone.
     content::BrowserThread::GetBlockingPool()->FlushForTesting();
     RunEvents();
   }
 
   TestPrerenderManager* prerender_manager() {
     return &prerender_manager_;
   }
 
   TestPrerenderContents* test_contents() {
     return &test_contents_;
   }
 
   // Runs any tasks queued on either thread.
   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_;
 };
 
 // Checks that deferred redirects are throttled and resumed correctly.
 TEST_F(PrerenderResourceThrottleTest, RedirectResume) {
   test_contents()->Start();
   RunEvents();
 
@@ skipping 98 matching lines @@
   // We should have cancelled the prerender.
   EXPECT_EQ(FINAL_STATUS_BAD_DEFERRED_REDIRECT,
             test_contents()->final_status());
 
   // Cleanup work so the prerender is gone.
   test_contents()->Cancel();
   RunEvents();
 }
 
 }  // namespace prerender