Commit f9b5d37b authored by Sean Kau's avatar Sean Kau Committed by Commit Bot

Change copy and assign deletion to appease the linter.

git cl lint wants the WeakPtrFactory to be the last element in the class.
However, DISALLOW_COPY_AND_ASSIGN is also supposed to be last.  To fix
this, remove the use of the macro.

Bug: None
Change-Id: Id617ab238d1a7929017fe8c28be2689e4d3df404
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1937137
Commit-Queue: Sean Kau <skau@chromium.org>
Commit-Queue: Luum Habtemariam <luum@chromium.org>
Auto-Submit: Sean Kau <skau@chromium.org>
Reviewed-by: default avatarLuum Habtemariam <luum@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719247}
parent d3e65312
...@@ -225,6 +225,10 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator { ...@@ -225,6 +225,10 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator {
base::MayBlock(), base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN})) { base::MayBlock(), base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN})) {
} }
BulkPrintersCalculatorImpl(const BulkPrintersCalculatorImpl&) = delete;
BulkPrintersCalculatorImpl& operator=(const BulkPrintersCalculatorImpl&) =
delete;
void AddObserver(Observer* observer) override { void AddObserver(Observer* observer) override {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
observers_.AddObserver(observer); observers_.AddObserver(observer);
...@@ -251,6 +255,7 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator { ...@@ -251,6 +255,7 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator {
void SetData(std::unique_ptr<std::string> data) override { void SetData(std::unique_ptr<std::string> data) override {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DVLOG(1) << "Set Data";
data_is_set_ = true; data_is_set_ = true;
TaskData task_data = TaskData task_data =
std::make_unique<TaskDataInternal>(++last_received_task_); std::make_unique<TaskDataInternal>(++last_received_task_);
...@@ -264,6 +269,7 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator { ...@@ -264,6 +269,7 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator {
void SetAccessMode(AccessMode mode) override { void SetAccessMode(AccessMode mode) override {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DVLOG(1) << "Set Access Mode: " << mode;
TaskData task_data = TaskData task_data =
std::make_unique<TaskDataInternal>(++last_received_task_); std::make_unique<TaskDataInternal>(++last_received_task_);
base::PostTaskAndReplyWithResult( base::PostTaskAndReplyWithResult(
...@@ -276,6 +282,7 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator { ...@@ -276,6 +282,7 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator {
void SetBlacklist(const std::vector<std::string>& blacklist) override { void SetBlacklist(const std::vector<std::string>& blacklist) override {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DVLOG(1) << "Number of blacklisted printers: " << blacklist.size();
TaskData task_data = TaskData task_data =
std::make_unique<TaskDataInternal>(++last_received_task_); std::make_unique<TaskDataInternal>(++last_received_task_);
base::PostTaskAndReplyWithResult( base::PostTaskAndReplyWithResult(
...@@ -288,6 +295,7 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator { ...@@ -288,6 +295,7 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator {
void SetWhitelist(const std::vector<std::string>& whitelist) override { void SetWhitelist(const std::vector<std::string>& whitelist) override {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DVLOG(1) << "Number of whitelisted printers: " << whitelist.size();
TaskData task_data = TaskData task_data =
std::make_unique<TaskDataInternal>(++last_received_task_); std::make_unique<TaskDataInternal>(++last_received_task_);
base::PostTaskAndReplyWithResult( base::PostTaskAndReplyWithResult(
...@@ -318,6 +326,7 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator { ...@@ -318,6 +326,7 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator {
// task. // task.
void OnComputationComplete(TaskData task_data) { void OnComputationComplete(TaskData task_data) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DVLOG(1) << "Attempt to compute printers";
if (!task_data || task_data->task_id <= last_processed_task_) { if (!task_data || task_data->task_id <= last_processed_task_) {
// The task is outdated (ClearData() was called in the meantime). // The task is outdated (ClearData() was called in the meantime).
return; return;
...@@ -328,6 +337,7 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator { ...@@ -328,6 +337,7 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator {
// No changes in the object's state. // No changes in the object's state.
return; return;
} }
DVLOG(1) << "Number of printers: " << task_data->printers.size();
printers_.swap(task_data->printers); printers_.swap(task_data->printers);
task_data.reset(); task_data.reset();
// Notifies observers about changes. // Notifies observers about changes.
...@@ -351,8 +361,8 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator { ...@@ -351,8 +361,8 @@ class BulkPrintersCalculatorImpl : public BulkPrintersCalculator {
std::unordered_map<std::string, Printer> printers_; std::unordered_map<std::string, Printer> printers_;
base::ObserverList<BulkPrintersCalculator::Observer>::Unchecked observers_; base::ObserverList<BulkPrintersCalculator::Observer>::Unchecked observers_;
SEQUENCE_CHECKER(sequence_checker_); SEQUENCE_CHECKER(sequence_checker_);
DISALLOW_COPY_AND_ASSIGN(BulkPrintersCalculatorImpl);
base::WeakPtrFactory<BulkPrintersCalculatorImpl> weak_ptr_factory_{this}; base::WeakPtrFactory<BulkPrintersCalculatorImpl> weak_ptr_factory_{this};
}; };
......
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