Switch from TestBrowserThread to TestBrowserThreadBundle in components.

components/feedback/feedback_data_unittest.cc

 // Copyright 2014 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 "components/feedback/feedback_data.h"
 
 #include <memory>
 #include <set>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "components/feedback/feedback_uploader.h"
 #include "components/feedback/feedback_uploader_factory.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/test/test_browser_context.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"
 
 namespace {
 
 const char kHistograms[] = "";
 const char kImageData[] = "";
 const char kFileData[] = "";
 
 using content::BrowserThread;
@@ skipping 20 matching lines @@
 
 }  // namespace
 
 namespace feedback {
 
 class FeedbackDataTest : public testing::Test {
  protected:
   FeedbackDataTest()
       : context_(new content::TestBrowserContext()),
         prefs_(new TestingPrefServiceSimple()),
-        data_(new FeedbackData()),
-        ui_thread_(content::BrowserThread::UI, &message_loop_) {
+        data_(new FeedbackData()) {
     user_prefs::UserPrefs::Set(context_.get(), prefs_.get());
     data_->set_context(context_.get());
     data_->set_send_report_callback(base::Bind(
         &FeedbackDataTest::set_send_report_callback, base::Unretained(this)));
 
     FeedbackUploaderFactory::GetInstance()->SetTestingFactory(
         context_.get(), &CreateFeedbackUploaderService);
   }
 
   void Send() {
@@ skipping 15 matching lines @@
 
   void set_send_report_callback(scoped_refptr<FeedbackData> data) {
     quit_closure_.Run();
   }
 
   base::Closure quit_closure_;
   std::unique_ptr<base::RunLoop> run_loop_;
   std::unique_ptr<content::TestBrowserContext> context_;
   std::unique_ptr<PrefService> prefs_;
   scoped_refptr<FeedbackData> data_;
-  base::MessageLoop message_loop_;
-  content::TestBrowserThread ui_thread_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
 };
 
 TEST_F(FeedbackDataTest, ReportSending) {
   data_->SetAndCompressHistograms(MakeScoped(kHistograms));
   data_->set_image(MakeScoped(kImageData));
   data_->AttachAndCompressFileData(MakeScoped(kFileData));
   Send();
   RunMessageLoop();
   EXPECT_TRUE(data_->IsDataComplete());
 }
 
 }  // namespace feedback