Switch from TestBrowserThread to TestBrowserThreadBundle in chrome.

chrome/browser/ui/webui/fileicon_source_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 "chrome/browser/ui/webui/fileicon_source.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
-#include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/fileicon_source.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using content::BrowserThread;
-
 namespace {
 
 class TestFileIconSource : public FileIconSource {
  public:
   TestFileIconSource() {}
 
   MOCK_METHOD4(FetchFileIcon,
                void(const base::FilePath& path,
                     float scale_factor,
                     IconLoader::IconSize icon_size,
                     const content::URLDataSource::GotDataCallback& callback));
 
   virtual ~TestFileIconSource() {}
 };
 
 class FileIconSourceTest : public testing::Test {
  public:
-  FileIconSourceTest()
-      : ui_thread_(BrowserThread::UI, base::MessageLoop::current()),
-        file_thread_(BrowserThread::FILE, base::MessageLoop::current()) {}
+  FileIconSourceTest() = default;
 
   static TestFileIconSource* CreateFileIconSource() {
     return new TestFileIconSource();
   }
 
  private:
-  base::MessageLoopForUI loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
 };
 
 const struct FetchFileIconExpectation {
   const char* request_path;
   const base::FilePath::CharType* unescaped_path;
   float scale_factor;
   IconLoader::IconSize size;
 } kBasicExpectations[] = {
   { "foo?bar", FILE_PATH_LITERAL("foo"), 1.0f, IconLoader::NORMAL },
   { "foo?bar&scale=2x", FILE_PATH_LITERAL("foo"), 2.0f, IconLoader::NORMAL },
@@ skipping 61 matching lines @@
                 FetchFileIcon(
                     base::FilePath(kBasicExpectations[i].unescaped_path),
                     kBasicExpectations[i].scale_factor,
                     kBasicExpectations[i].size, CallbackIsNull()));
     source->StartDataRequest(
         kBasicExpectations[i].request_path,
         content::ResourceRequestInfo::WebContentsGetter(),
         callback);
   }
 }