Switch from TestBrowserThread to TestBrowserThreadBundle in components.

components/feedback/feedback_uploader_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_uploader.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <set>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "build/build_config.h"
 #include "components/feedback/feedback_uploader_chrome.h"
 #include "components/feedback/feedback_uploader_factory.h"
 #include "components/sync_preferences/testing_pref_service_syncable.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 kReportOne[] = "one";
 const char kReportTwo[] = "two";
 const char kReportThree[] = "three";
 const char kReportFour[] = "four";
 const char kReportFive[] = "five";
 
 const base::TimeDelta kRetryDelayForTest =
     base::TimeDelta::FromMilliseconds(100);
 
 std::unique_ptr<KeyedService> CreateFeedbackUploaderService(
     content::BrowserContext* context) {
   return base::MakeUnique<feedback::FeedbackUploaderChrome>(context);
 }
 
 }  // namespace
 
 namespace feedback {
 
 class FeedbackUploaderTest : public testing::Test {
  protected:
   FeedbackUploaderTest()
-      : ui_thread_(content::BrowserThread::UI, &message_loop_),
-        context_(new content::TestBrowserContext()),
+      : context_(new content::TestBrowserContext()),
         prefs_(new sync_preferences::TestingPrefServiceSyncable()),
         dispatched_reports_count_(0),
         expected_reports_(0) {
     user_prefs::UserPrefs::Set(context_.get(), prefs_.get());
     FeedbackUploaderFactory::GetInstance()->SetTestingFactory(
         context_.get(), &CreateFeedbackUploaderService);
 
     uploader_ = FeedbackUploaderFactory::GetForBrowserContext(context_.get());
     uploader_->setup_for_test(
         base::Bind(&FeedbackUploaderTest::MockDispatchReport,
@@ skipping 36 matching lines @@
     return (dispatched_reports_count_ >= expected_reports_);
   }
 
   void RunMessageLoop() {
     if (ProcessingComplete())
       return;
     run_loop_.reset(new base::RunLoop());
     run_loop_->Run();
   }
 
-  base::MessageLoop message_loop_;
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
   std::unique_ptr<base::RunLoop> run_loop_;
-  content::TestBrowserThread ui_thread_;
   std::unique_ptr<content::TestBrowserContext> context_;
   std::unique_ptr<PrefService> prefs_;
 
   FeedbackUploader* uploader_;
 
   std::map<std::string, unsigned int> dispatched_reports_;
   size_t dispatched_reports_count_;
   size_t expected_reports_;
 };
 
@@ skipping 40 matching lines @@
 
   EXPECT_EQ(dispatched_reports_.size(), 5u);
   EXPECT_EQ(dispatched_reports_[kReportOne], 1u);
   EXPECT_EQ(dispatched_reports_[kReportTwo], 2u);
   EXPECT_EQ(dispatched_reports_[kReportThree], 2u);
   EXPECT_EQ(dispatched_reports_[kReportFour], 1u);
   EXPECT_EQ(dispatched_reports_[kReportFive], 1u);
 }
 
 }  // namespace feedback