Use TaskScheduler instead of SequencedWorkerPool in components/feedback.

SequencedWorkerPool is being deprecated in favor of TaskScheduler.

BUG=667892
R=jochen@chromium.org

Review-Url: https://codereview.chromium.org/2876213002
Cr-Commit-Position: refs/heads/master@{#473979}

components/feedback/feedback_data_unittest.cc

@@ -16,7 +16,6 @@
 #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"
@@ -27,13 +26,10 @@ const char kHistograms[] = "";
 const char kImageData[] = "";
 const char kFileData[] = "";
 
-using content::BrowserThread;
-
 class MockUploader : public feedback::FeedbackUploader, public KeyedService {
  public:
   MockUploader(content::BrowserContext* context)
-      : FeedbackUploader(context ? context->GetPath() : base::FilePath(),
-                         BrowserThread::GetBlockingPool()) {}
+      : FeedbackUploader(context ? context->GetPath() : base::FilePath()) {}
 
   MOCK_METHOD1(DispatchReport, void(const std::string&));
 };

components/feedback/feedback_uploader.cc

@@ -11,7 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
-#include "base/threading/sequenced_worker_pool.h"
+#include "base/task_scheduler/post_task.h"
 #include "components/feedback/feedback_report.h"
 
 namespace feedback {
@@ -33,22 +33,18 @@ bool FeedbackUploader::ReportsUploadTimeComparator::operator()(
   return a->upload_at() > b->upload_at();
 }
 
-FeedbackUploader::FeedbackUploader(const base::FilePath& path,
-                                   base::SequencedWorkerPool* pool)
+FeedbackUploader::FeedbackUploader(const base::FilePath& path)
     : report_path_(path.Append(kFeedbackReportPath)),
       retry_delay_(base::TimeDelta::FromMinutes(kRetryDelayMinutes)),
-      url_(kFeedbackPostUrl),
-      pool_(pool) {
+      url_(kFeedbackPostUrl) {
   Init();
 }
 
 FeedbackUploader::FeedbackUploader(const base::FilePath& path,
-                                   base::SequencedWorkerPool* pool,
                                    const std::string& url)
     : report_path_(path.Append(kFeedbackReportPath)),
       retry_delay_(base::TimeDelta::FromMinutes(kRetryDelayMinutes)),
-      url_(url),
-      pool_(pool) {
+      url_(url) {
   Init();
 }
 
@@ -92,9 +88,9 @@ void FeedbackUploader::QueueReportWithDelay(const std::string& data,
   // Uses a BLOCK_SHUTDOWN file task runner because we really don't want to
   // lose reports.
   scoped_refptr<base::SequencedTaskRunner> task_runner =
-      pool_->GetSequencedTaskRunnerWithShutdownBehavior(
-          pool_->GetSequenceToken(),
-          base::SequencedWorkerPool::BLOCK_SHUTDOWN);
+      base::CreateSequencedTaskRunnerWithTraits(
+          {base::MayBlock(), base::TaskPriority::BACKGROUND,
+           base::TaskShutdownBehavior::BLOCK_SHUTDOWN});
 
   reports_queue_.push(new FeedbackReport(report_path_,
                                          base::Time::Now() + delay,

components/feedback/feedback_uploader.h

@@ -11,7 +11,6 @@
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 
@@ -26,10 +25,8 @@ class FeedbackReport;
 // tried again when it's turn comes up next in the queue.
 class FeedbackUploader : public base::SupportsWeakPtr<FeedbackUploader> {
  public:
+  FeedbackUploader(const base::FilePath& path);
   FeedbackUploader(const base::FilePath& path,
-                   base::SequencedWorkerPool* pool);
-  FeedbackUploader(const base::FilePath& path,
-                   base::SequencedWorkerPool* pool,
                    const std::string& url);
   virtual ~FeedbackUploader();
 
@@ -76,7 +73,6 @@ class FeedbackUploader : public base::SupportsWeakPtr<FeedbackUploader> {
   ReportDataCallback dispatch_callback_;
   base::TimeDelta retry_delay_;
   std::string url_;
-  base::SequencedWorkerPool* pool_;
 
   DISALLOW_COPY_AND_ASSIGN(FeedbackUploader);
 };

components/feedback/feedback_uploader_chrome.cc

@@ -10,22 +10,18 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/task_runner_util.h"
-#include "base/threading/sequenced_worker_pool.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/feedback/feedback_report.h"
 #include "components/feedback/feedback_switches.h"
 #include "components/feedback/feedback_uploader_delegate.h"
 #include "components/variations/net/variations_http_headers.h"
 #include "content/public/browser/browser_context.h"
-#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "net/base/load_flags.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_fetcher.h"
 #include "url/gurl.h"
 
-using content::BrowserThread;
-
 namespace feedback {
 namespace {
 
@@ -33,10 +29,8 @@ const char kProtoBufMimeType[] = "application/x-protobuf";
 
 }  // namespace
 
-FeedbackUploaderChrome::FeedbackUploaderChrome(
-    content::BrowserContext* context)
-    : FeedbackUploader(context ? context->GetPath() : base::FilePath(),
-                       BrowserThread::GetBlockingPool()),
+FeedbackUploaderChrome::FeedbackUploaderChrome(content::BrowserContext* context)
+    : FeedbackUploader(context ? context->GetPath() : base::FilePath()),
       context_(context) {
   CHECK(context_);
   const base::CommandLine& command_line =