Remove call to GetBlockingPool in RLZ

components/rlz/rlz_tracker.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.
 //
 // This code glues the RLZ library DLL with Chrome. It allows Chrome to work
 // with or without the DLL being present. If the DLL is not present the
 // functions do nothing and just return false.
 
 #include "components/rlz/rlz_tracker.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
+#include "base/sequenced_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/task_scheduler/post_task.h"
+#include "base/task_scheduler/task_traits.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "components/rlz/rlz_tracker_delegate.h"
 
 namespace rlz {
 namespace {
 
 // Maximum and minimum delay for financial ping we would allow to be set through
 // master preferences. Somewhat arbitrary, may need to be adjusted in future.
 const base::TimeDelta kMaxInitDelay = base::TimeDelta::FromSeconds(200);
@@ skipping 129 matching lines @@
 RLZTracker::RLZTracker()
     : first_run_(false),
       send_ping_immediately_(false),
       is_google_default_search_(false),
       is_google_homepage_(false),
       is_google_in_startpages_(false),
       already_ran_(false),
       omnibox_used_(false),
       homepage_used_(false),
       app_list_used_(false),
-      min_init_delay_(kMinInitDelay) {
-}
+      min_init_delay_(kMinInitDelay),
+      task_runner_(base::CreateSequencedTaskRunnerWithTraits(
+          {base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN,
+           base::WithBaseSyncPrimitives(), base::TaskPriority::BACKGROUND})) {}
 
 RLZTracker::~RLZTracker() {
 }
 
 // static
 void RLZTracker::SetRlzDelegate(std::unique_ptr<RLZTrackerDelegate> delegate) {
   RLZTracker* tracker = GetInstance();
   if (!tracker->delegate_) {
     // RLZTracker::SetRlzDelegate is called at Profile creation time which can
     // happens multiple time on ChromeOS, so do nothing if the delegate already
     // exists.
     tracker->SetDelegate(std::move(delegate));
   }
 }
 
 void RLZTracker::SetDelegate(std::unique_ptr<RLZTrackerDelegate> delegate) {
   DCHECK(delegate);
   DCHECK(!delegate_);
   delegate_ = std::move(delegate);
-  worker_pool_token_ = delegate_->GetBlockingPool()->GetSequenceToken();
 }
 
 // static
 bool RLZTracker::InitRlzDelayed(bool first_run,
                                 bool send_ping_immediately,
                                 base::TimeDelta delay,
                                 bool is_google_default_search,
                                 bool is_google_homepage,
                                 bool is_google_in_startpages) {
   return GetInstance()->Init(first_run, send_ping_immediately, delay,
@@ skipping 57 matching lines @@
 void RLZTracker::Cleanup() {
   rlz_cache_.clear();
   if (delegate_)
     delegate_->Cleanup();
 }
 
 void RLZTracker::ScheduleDelayedInit(base::TimeDelta delay) {
   DCHECK(delegate_) << "RLZTracker used before initialization";
   // The RLZTracker is a singleton object that outlives any runnable tasks
   // that will be queued up.
-  delegate_->GetBlockingPool()->PostDelayedSequencedWorkerTask(
-      worker_pool_token_, FROM_HERE,
-      base::Bind(&RLZTracker::DelayedInit, base::Unretained(this)), delay);
+  task_runner_->PostDelayedTask(
+      FROM_HERE, base::Bind(&RLZTracker::DelayedInit, base::Unretained(this)),
+      delay);
 }
 
 void RLZTracker::DelayedInit() {
   DCHECK(delegate_) << "RLZTracker used before initialization";
   bool schedule_ping = false;
 
   // For organic brandcodes do not use rlz at all. Empty brandcode usually
   // means a chromium install. This is ok.
   if (!delegate_->IsBrandOrganic(brand_)) {
     RecordProductEvents(first_run_, is_google_default_search_,
@@ skipping 15 matching lines @@
   }
 
   already_ran_ = true;
 
   if (schedule_ping)
     ScheduleFinancialPing();
 }
 
 void RLZTracker::ScheduleFinancialPing() {
   DCHECK(delegate_) << "RLZTracker used before initialization";
-  delegate_->GetBlockingPool()->PostSequencedWorkerTaskWithShutdownBehavior(
-      worker_pool_token_, FROM_HERE,
-      base::Bind(&RLZTracker::PingNowImpl, base::Unretained(this)),
-      base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
+  task_runner_->PostTask(
+      FROM_HERE, base::Bind(&RLZTracker::PingNowImpl, base::Unretained(this)));
 }
 
 void RLZTracker::PingNowImpl() {
   DCHECK(delegate_) << "RLZTracker used before initialization";
   TRACE_EVENT0("RLZ", "RLZTracker::PingNowImpl");
   base::string16 lang;
   delegate_->GetLanguage(&lang);
   if (lang.empty())
     lang = base::ASCIIToUTF16("en");
   base::string16 referral;
@@ skipping 60 matching lines @@
   return ret;
 }
 
 bool RLZTracker::ScheduleRecordProductEvent(rlz_lib::Product product,
                                             rlz_lib::AccessPoint point,
                                             rlz_lib::Event event_id) {
   DCHECK(delegate_) << "RLZTracker used before initialization";
   if (!delegate_->IsOnUIThread())
     return false;
 
-  delegate_->GetBlockingPool()->PostSequencedWorkerTaskWithShutdownBehavior(
-      worker_pool_token_, FROM_HERE,
-      base::Bind(base::IgnoreResult(&RLZTracker::RecordProductEvent), product,
-                 point, event_id),
-      base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
-
+  task_runner_->PostTask(
+      FROM_HERE, base::Bind(base::IgnoreResult(&RLZTracker::RecordProductEvent),
+                            product, point, event_id));
   return true;
 }
 
 void RLZTracker::RecordFirstSearch(rlz_lib::AccessPoint point) {
   DCHECK(delegate_) << "RLZTracker used before initialization";
   // Make sure we don't access disk outside of the I/O thread.
   // In such case we repost the task on the right thread and return error.
   if (ScheduleRecordFirstSearch(point))
     return;
 
   bool* record_used = GetAccessPointRecord(point);
 
   // Try to record event now, else set the flag to try later when we
   // attempt the ping.
-  if (!RecordProductEvent(rlz_lib::CHROME, point, rlz_lib::FIRST_SEARCH))
+  if (!RecordProductEvent(rlz_lib::CHROME, point, rlz_lib::FIRST_SEARCH)) {
     *record_used = true;
-  else if (send_ping_immediately_ && point == ChromeOmnibox())
+  } else if (send_ping_immediately_ && point == ChromeOmnibox()) {
     ScheduleDelayedInit(base::TimeDelta());
+  }
 }
 
 bool RLZTracker::ScheduleRecordFirstSearch(rlz_lib::AccessPoint point) {
   DCHECK(delegate_) << "RLZTracker used before initialization";
   if (!delegate_->IsOnUIThread())
     return false;
-  delegate_->GetBlockingPool()->PostSequencedWorkerTaskWithShutdownBehavior(
-      worker_pool_token_, FROM_HERE,
-      base::Bind(&RLZTracker::RecordFirstSearch, base::Unretained(this), point),
-      base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
+  task_runner_->PostTask(FROM_HERE, base::Bind(&RLZTracker::RecordFirstSearch,
+                                               base::Unretained(this), point));
   return true;
 }
 
 bool* RLZTracker::GetAccessPointRecord(rlz_lib::AccessPoint point) {
   if (point == ChromeOmnibox())
     return &omnibox_used_;
 #if !defined(OS_IOS)
   if (point == ChromeHomePage())
     return &homepage_used_;
   if (point == ChromeAppList())
@@ skipping 64 matching lines @@
   rlz_cache_[point] = rlz_local;
   return true;
 }
 
 bool RLZTracker::ScheduleGetAccessPointRlz(rlz_lib::AccessPoint point) {
   DCHECK(delegate_) << "RLZTracker used before initialization";
   if (!delegate_->IsOnUIThread())
     return false;
 
   base::string16* not_used = nullptr;
-  delegate_->GetBlockingPool()->PostSequencedWorkerTaskWithShutdownBehavior(
-      worker_pool_token_, FROM_HERE,
-      base::Bind(base::IgnoreResult(&RLZTracker::GetAccessPointRlz), point,
-                 not_used),
-      base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
+  task_runner_->PostTask(
+      FROM_HERE, base::Bind(base::IgnoreResult(&RLZTracker::GetAccessPointRlz),
+                            point, not_used));
   return true;
 }
 
 #if defined(OS_CHROMEOS)
 // static
 void RLZTracker::ClearRlzState() {
   RLZTracker* tracker = GetInstance();
   if (tracker->delegate_)
     tracker->ClearRlzStateImpl();
 }
 
 void RLZTracker::ClearRlzStateImpl() {

[gab, 2017/07/27 18:29:37]

DCHECK(impl_task_runner_->RunsTasksOnCurrentSequence());

here and elsewhere to help document what runs where.

[Roger Tawa OOO till Jul 10th, 2017/07/28 18:43:06]

Added where it makes sense.

   DCHECK(delegate_) << "RLZTracker used before initialization";
   if (ScheduleClearRlzState())
     return;
   rlz_lib::ClearAllProductEvents(rlz_lib::CHROME);
 }
 
 bool RLZTracker::ScheduleClearRlzState() {
   DCHECK(delegate_) << "RLZTracker used before initialization";
   if (!delegate_->IsOnUIThread())
     return false;
 
-  delegate_->GetBlockingPool()->PostSequencedWorkerTaskWithShutdownBehavior(
-      worker_pool_token_, FROM_HERE,
-      base::Bind(&RLZTracker::ClearRlzStateImpl, base::Unretained(this)),
-      base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
+  task_runner_->PostTask(FROM_HERE, base::Bind(&RLZTracker::ClearRlzStateImpl,
+                                               base::Unretained(this)));
   return true;
 }
 #endif
 
 // static
 void RLZTracker::CleanupRlz() {
   GetInstance()->Cleanup();
   rlz_lib::SetURLRequestContext(nullptr);
 }
 
 // static
 void RLZTracker::EnableZeroDelayForTesting() {
   GetInstance()->min_init_delay_ = base::TimeDelta();
 }
 
 #if !defined(OS_IOS)
 // static
 void RLZTracker::RecordAppListSearch() {
   // This method is called during unit tests while the RLZTracker has not been
   // initialized, so check for the presence of a delegate and exit if there is
   // none registered.
   RLZTracker* tracker = GetInstance();
   if (tracker->delegate_)
     tracker->RecordFirstSearch(RLZTracker::ChromeAppList());
 }
 #endif
 
 }  // namespace rlz