commit d52bb2405534116ab92c9bd64e8737c07aff6a85
author fdoray <fdoray@chromium.org> Fri Apr 07 11:49:22 2017
committer Commit bot <commit-bot@chromium.org> Fri Apr 07 11:49:22 2017
tree 19b11f5f507fe39129b498beda0bb1b04ed2f38c
parent 8e733c5577bc6faf6266ef93e8a27bef338f2fef

Switch from TestBrowserThread to TestBrowserThreadBundle in components.

TestBrowserThread is deprecated. TestBrowserThreadBundle provides all
browser threads, a blocking pool and a TaskScheduler.

This CL was generated using the script posted on the bug +
git cl format +
tools/sort-headers.py +
some manual adjustments.

BUG=272091
R=gab@chromium.org
TBR=jochen@chromium.org

Review-Url: https://codereview.chromium.org/2799253002
Cr-Original-Commit-Position: refs/heads/master@{#462839}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: d672606e5db906db421e0dd87703f53788dbfffa

feedback_data_unittest.cc

diff --git a/feedback_data_unittest.cc b/feedback_data_unittest.cc
index c41e072..d6e353b 100644
--- a/feedback_data_unittest.cc
+++ b/feedback_data_unittest.cc
@@ -9,7 +9,6 @@
 #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"
@@ -18,6 +17,7 @@
 #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"
 
@@ -58,8 +58,7 @@
   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(
@@ -95,8 +94,7 @@
   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) {

feedback_uploader_unittest.cc

diff --git a/feedback_uploader_unittest.cc b/feedback_uploader_unittest.cc
index 17a6ec5..76201f3 100644
--- a/feedback_uploader_unittest.cc
+++ b/feedback_uploader_unittest.cc
@@ -11,7 +11,6 @@
 
 #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"
@@ -20,7 +19,7 @@
 #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"
 
@@ -47,8 +46,7 @@
 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) {
@@ -105,9 +103,8 @@
     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_;