Commit bc29720a authored by Jered Gray's avatar Jered Gray Committed by Commit Bot

Task runner name change in PreviewsOptimizationGuide

The task runner being used in PreviewsOptimizationGuide was UI,
but it was named IO. The name has been updated to reflect the
actual task runner passed in.

Change-Id: Iab6e07c148ca087194d9b876dff4f4f5b285a153
Reviewed-on: https://chromium-review.googlesource.com/c/1338727Reviewed-by: default avatarDoug Arnett <dougarnett@chromium.org>
Reviewed-by: default avatarRyan Sturm <ryansturm@chromium.org>
Reviewed-by: default avatarTarun Bansal <tbansal@chromium.org>
Commit-Queue: Jered Gray <jegray@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611251}
parent 0ff71979
...@@ -133,8 +133,8 @@ class TestPreviewsOptimizationGuide : public PreviewsOptimizationGuide { ...@@ -133,8 +133,8 @@ class TestPreviewsOptimizationGuide : public PreviewsOptimizationGuide {
public: public:
TestPreviewsOptimizationGuide( TestPreviewsOptimizationGuide(
optimization_guide::OptimizationGuideService* optimization_guide_service, optimization_guide::OptimizationGuideService* optimization_guide_service,
const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner)
: PreviewsOptimizationGuide(optimization_guide_service, io_task_runner) {} : PreviewsOptimizationGuide(optimization_guide_service, ui_task_runner) {}
~TestPreviewsOptimizationGuide() override {} ~TestPreviewsOptimizationGuide() override {}
// PreviewsOptimizationGuide: // PreviewsOptimizationGuide:
......
...@@ -17,12 +17,12 @@ namespace previews { ...@@ -17,12 +17,12 @@ namespace previews {
PreviewsOptimizationGuide::PreviewsOptimizationGuide( PreviewsOptimizationGuide::PreviewsOptimizationGuide(
optimization_guide::OptimizationGuideService* optimization_guide_service, optimization_guide::OptimizationGuideService* optimization_guide_service,
const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner)
: optimization_guide_service_(optimization_guide_service), : optimization_guide_service_(optimization_guide_service),
io_task_runner_(io_task_runner), ui_task_runner_(ui_task_runner),
background_task_runner_(base::CreateSequencedTaskRunnerWithTraits( background_task_runner_(base::CreateSequencedTaskRunnerWithTraits(
{base::MayBlock(), base::TaskPriority::BEST_EFFORT})), {base::MayBlock(), base::TaskPriority::BEST_EFFORT})),
io_weak_ptr_factory_(this) { ui_weak_ptr_factory_(this) {
DCHECK(optimization_guide_service_); DCHECK(optimization_guide_service_);
optimization_guide_service_->AddObserver(this); optimization_guide_service_->AddObserver(this);
} }
...@@ -36,7 +36,7 @@ bool PreviewsOptimizationGuide::IsWhitelisted( ...@@ -36,7 +36,7 @@ bool PreviewsOptimizationGuide::IsWhitelisted(
const GURL& url, const GURL& url,
PreviewsType type, PreviewsType type,
net::EffectiveConnectionType* out_ect_threshold) const { net::EffectiveConnectionType* out_ect_threshold) const {
DCHECK(io_task_runner_->BelongsToCurrentThread()); DCHECK(ui_task_runner_->BelongsToCurrentThread());
if (!hints_) if (!hints_)
return false; return false;
...@@ -53,7 +53,7 @@ bool PreviewsOptimizationGuide::IsWhitelisted( ...@@ -53,7 +53,7 @@ bool PreviewsOptimizationGuide::IsWhitelisted(
bool PreviewsOptimizationGuide::IsBlacklisted(const GURL& url, bool PreviewsOptimizationGuide::IsBlacklisted(const GURL& url,
PreviewsType type) const { PreviewsType type) const {
DCHECK(io_task_runner_->BelongsToCurrentThread()); DCHECK(ui_task_runner_->BelongsToCurrentThread());
if (!hints_) if (!hints_)
return false; return false;
...@@ -64,7 +64,7 @@ void PreviewsOptimizationGuide::OnLoadedHint( ...@@ -64,7 +64,7 @@ void PreviewsOptimizationGuide::OnLoadedHint(
ResourceLoadingHintsCallback callback, ResourceLoadingHintsCallback callback,
const GURL& document_url, const GURL& document_url,
const optimization_guide::proto::Hint& loaded_hint) const { const optimization_guide::proto::Hint& loaded_hint) const {
DCHECK(io_task_runner_->BelongsToCurrentThread()); DCHECK(ui_task_runner_->BelongsToCurrentThread());
const optimization_guide::proto::PageHint* matched_page_hint = const optimization_guide::proto::PageHint* matched_page_hint =
PreviewsHints::FindPageHint(document_url, loaded_hint); PreviewsHints::FindPageHint(document_url, loaded_hint);
...@@ -101,14 +101,14 @@ void PreviewsOptimizationGuide::OnLoadedHint( ...@@ -101,14 +101,14 @@ void PreviewsOptimizationGuide::OnLoadedHint(
bool PreviewsOptimizationGuide::MaybeLoadOptimizationHints( bool PreviewsOptimizationGuide::MaybeLoadOptimizationHints(
const GURL& url, const GURL& url,
ResourceLoadingHintsCallback callback) { ResourceLoadingHintsCallback callback) {
DCHECK(io_task_runner_->BelongsToCurrentThread()); DCHECK(ui_task_runner_->BelongsToCurrentThread());
if (!hints_) if (!hints_)
return false; return false;
return hints_->MaybeLoadOptimizationHints( return hints_->MaybeLoadOptimizationHints(
url, base::BindOnce(&PreviewsOptimizationGuide::OnLoadedHint, url, base::BindOnce(&PreviewsOptimizationGuide::OnLoadedHint,
io_weak_ptr_factory_.GetWeakPtr(), ui_weak_ptr_factory_.GetWeakPtr(),
std::move(callback), url)); std::move(callback), url));
} }
...@@ -125,18 +125,18 @@ void PreviewsOptimizationGuide::LogHintCacheMatch( ...@@ -125,18 +125,18 @@ void PreviewsOptimizationGuide::LogHintCacheMatch(
void PreviewsOptimizationGuide::OnHintsProcessed( void PreviewsOptimizationGuide::OnHintsProcessed(
const optimization_guide::proto::Configuration& config, const optimization_guide::proto::Configuration& config,
const optimization_guide::ComponentInfo& info) { const optimization_guide::ComponentInfo& info) {
DCHECK(io_task_runner_->BelongsToCurrentThread()); DCHECK(ui_task_runner_->BelongsToCurrentThread());
base::PostTaskAndReplyWithResult( base::PostTaskAndReplyWithResult(
background_task_runner_.get(), FROM_HERE, background_task_runner_.get(), FROM_HERE,
base::BindOnce(&PreviewsHints::CreateFromConfig, config, info), base::BindOnce(&PreviewsHints::CreateFromConfig, config, info),
base::BindOnce(&PreviewsOptimizationGuide::UpdateHints, base::BindOnce(&PreviewsOptimizationGuide::UpdateHints,
io_weak_ptr_factory_.GetWeakPtr())); ui_weak_ptr_factory_.GetWeakPtr()));
} }
void PreviewsOptimizationGuide::UpdateHints( void PreviewsOptimizationGuide::UpdateHints(
std::unique_ptr<PreviewsHints> hints) { std::unique_ptr<PreviewsHints> hints) {
DCHECK(io_task_runner_->BelongsToCurrentThread()); DCHECK(ui_task_runner_->BelongsToCurrentThread());
hints_ = std::move(hints); hints_ = std::move(hints);
if (hints_) if (hints_)
hints_->Initialize(); hints_->Initialize();
......
...@@ -42,7 +42,7 @@ class PreviewsOptimizationGuide ...@@ -42,7 +42,7 @@ class PreviewsOptimizationGuide
// The embedder guarantees |optimization_guide_service| outlives |this|. // The embedder guarantees |optimization_guide_service| outlives |this|.
PreviewsOptimizationGuide( PreviewsOptimizationGuide(
optimization_guide::OptimizationGuideService* optimization_guide_service, optimization_guide::OptimizationGuideService* optimization_guide_service,
const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner); const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner);
~PreviewsOptimizationGuide() override; ~PreviewsOptimizationGuide() override;
...@@ -94,8 +94,8 @@ class PreviewsOptimizationGuide ...@@ -94,8 +94,8 @@ class PreviewsOptimizationGuide
// The OptimizationGuideService that this guide is listening to. Not owned. // The OptimizationGuideService that this guide is listening to. Not owned.
optimization_guide::OptimizationGuideService* optimization_guide_service_; optimization_guide::OptimizationGuideService* optimization_guide_service_;
// Runner for IO thread tasks. // Runner for UI thread tasks.
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
// Background thread where hints processing should be performed. // Background thread where hints processing should be performed.
scoped_refptr<base::SequencedTaskRunner> background_task_runner_; scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
...@@ -103,8 +103,8 @@ class PreviewsOptimizationGuide ...@@ -103,8 +103,8 @@ class PreviewsOptimizationGuide
// The current hints used for this optimization guide. // The current hints used for this optimization guide.
std::unique_ptr<PreviewsHints> hints_; std::unique_ptr<PreviewsHints> hints_;
// Used to get |weak_ptr_| to self on the IO thread. // Used to get |weak_ptr_| to self on the UI thread.
base::WeakPtrFactory<PreviewsOptimizationGuide> io_weak_ptr_factory_; base::WeakPtrFactory<PreviewsOptimizationGuide> ui_weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(PreviewsOptimizationGuide); DISALLOW_COPY_AND_ASSIGN(PreviewsOptimizationGuide);
}; };
......
...@@ -39,8 +39,8 @@ class TestOptimizationGuideService ...@@ -39,8 +39,8 @@ class TestOptimizationGuideService
: public optimization_guide::OptimizationGuideService { : public optimization_guide::OptimizationGuideService {
public: public:
explicit TestOptimizationGuideService( explicit TestOptimizationGuideService(
const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner) const scoped_refptr<base::SingleThreadTaskRunner>& ui_task_runner)
: OptimizationGuideService(io_task_runner), : OptimizationGuideService(ui_task_runner),
remove_observer_called_(false) {} remove_observer_called_(false) {}
void RemoveObserver( void RemoveObserver(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment