Eliminate more task runner injection in the component updater.
Bug: 740992
Change-Id: Ib84f64eeef096850a48c8da632bd88fc74bffaf3
Reviewed-on: https://chromium-review.googlesource.com/581828
Commit-Queue: Sorin Jianu <[email protected]>
Reviewed-by: Joshua Pawlicki <[email protected]>
Cr-Commit-Position: refs/heads/master@{#488876}diff --git a/components/update_client/update_client_unittest.cc b/components/update_client/update_client_unittest.cc
index 98d02bc..fca7137 100644
--- a/components/update_client/update_client_unittest.cc
+++ b/components/update_client/update_client_unittest.cc
@@ -245,7 +245,7 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
@@ -267,9 +267,7 @@
component->SetParseResult(result);
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(update_check_callback, 0, 0));
-
- return true;
+ FROM_HERE, base::BindOnce(update_check_callback, 0, 0));
}
};
@@ -358,7 +356,7 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
@@ -429,8 +427,7 @@
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(update_check_callback, 0, 0));
- return true;
+ FROM_HERE, base::BindOnce(update_check_callback, 0, 0));
}
};
@@ -465,13 +462,13 @@
result.total_bytes = 1843;
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(&FakeCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ FROM_HERE, base::BindOnce(&FakeCrxDownloader::OnDownloadProgress,
+ base::Unretained(this), result));
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE,
- base::Bind(&FakeCrxDownloader::OnDownloadComplete,
- base::Unretained(this), true, result, download_metrics));
+ FROM_HERE, base::BindOnce(&FakeCrxDownloader::OnDownloadComplete,
+ base::Unretained(this), true, result,
+ download_metrics));
}
};
@@ -570,7 +567,7 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
@@ -663,8 +660,7 @@
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(update_check_callback, 0, 0));
- return true;
+ FROM_HERE, base::BindOnce(update_check_callback, 0, 0));
}
};
@@ -719,8 +715,8 @@
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(&FakeCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ FROM_HERE, base::BindOnce(&FakeCrxDownloader::OnDownloadProgress,
+ base::Unretained(this), result));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
@@ -840,7 +836,7 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
@@ -930,8 +926,7 @@
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(update_check_callback, 0, 0));
- return true;
+ FROM_HERE, base::BindOnce(update_check_callback, 0, 0));
}
};
@@ -986,13 +981,13 @@
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(&FakeCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ FROM_HERE, base::BindOnce(&FakeCrxDownloader::OnDownloadProgress,
+ base::Unretained(this), result));
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE,
- base::Bind(&FakeCrxDownloader::OnDownloadComplete,
- base::Unretained(this), true, result, download_metrics));
+ FROM_HERE, base::BindOnce(&FakeCrxDownloader::OnDownloadComplete,
+ base::Unretained(this), true, result,
+ download_metrics));
}
};
@@ -1111,7 +1106,7 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
@@ -1217,8 +1212,7 @@
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(update_check_callback, 0, 0));
- return true;
+ FROM_HERE, base::BindOnce(update_check_callback, 0, 0));
}
};
@@ -1273,13 +1267,13 @@
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(&FakeCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ FROM_HERE, base::BindOnce(&FakeCrxDownloader::OnDownloadProgress,
+ base::Unretained(this), result));
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE,
- base::Bind(&FakeCrxDownloader::OnDownloadComplete,
- base::Unretained(this), true, result, download_metrics));
+ FROM_HERE, base::BindOnce(&FakeCrxDownloader::OnDownloadComplete,
+ base::Unretained(this), true, result,
+ download_metrics));
}
};
@@ -1440,7 +1434,7 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
@@ -1488,8 +1482,7 @@
component->SetParseResult(result);
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(update_check_callback, 0, 0));
- return true;
+ FROM_HERE, base::BindOnce(update_check_callback, 0, 0));
}
};
@@ -1528,9 +1521,9 @@
base::Unretained(this), result));
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE,
- base::Bind(&FakeCrxDownloader::OnDownloadComplete,
- base::Unretained(this), true, result, download_metrics));
+ FROM_HERE, base::BindOnce(&FakeCrxDownloader::OnDownloadComplete,
+ base::Unretained(this), true, result,
+ download_metrics));
}
};
@@ -1628,7 +1621,7 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
@@ -1736,8 +1729,7 @@
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(update_check_callback, 0, 0));
- return true;
+ FROM_HERE, base::BindOnce(update_check_callback, 0, 0));
}
};
@@ -1807,13 +1799,13 @@
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(&FakeCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ FROM_HERE, base::BindOnce(&FakeCrxDownloader::OnDownloadProgress,
+ base::Unretained(this), result));
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE,
- base::Bind(&FakeCrxDownloader::OnDownloadComplete,
- base::Unretained(this), true, result, download_metrics));
+ FROM_HERE, base::BindOnce(&FakeCrxDownloader::OnDownloadComplete,
+ base::Unretained(this), true, result,
+ download_metrics));
}
};
@@ -1934,7 +1926,7 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
@@ -1956,8 +1948,7 @@
component->SetParseResult(result);
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(update_check_callback, 0, 0));
- return true;
+ FROM_HERE, base::BindOnce(update_check_callback, 0, 0));
}
};
@@ -2047,7 +2038,7 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
@@ -2101,8 +2092,7 @@
EXPECT_TRUE(component->on_demand());
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(update_check_callback, 0, 0));
- return true;
+ FROM_HERE, base::BindOnce(update_check_callback, 0, 0));
}
};
@@ -2141,13 +2131,13 @@
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(&FakeCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ FROM_HERE, base::BindOnce(&FakeCrxDownloader::OnDownloadProgress,
+ base::Unretained(this), result));
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE,
- base::Bind(&FakeCrxDownloader::OnDownloadComplete,
- base::Unretained(this), true, result, download_metrics));
+ FROM_HERE, base::BindOnce(&FakeCrxDownloader::OnDownloadComplete,
+ base::Unretained(this), true, result,
+ download_metrics));
}
};
@@ -2240,7 +2230,7 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
@@ -2263,8 +2253,7 @@
EXPECT_TRUE(component->on_demand());
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(update_check_callback, 0, 0));
- return true;
+ FROM_HERE, base::BindOnce(update_check_callback, 0, 0));
}
};
@@ -2346,14 +2335,12 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
- const UpdateCheckCallback& update_check_callback) override {
- return false;
- }
+ const UpdateCheckCallback& update_check_callback) override {}
};
class FakeCrxDownloader : public CrxDownloader {
@@ -2398,14 +2385,12 @@
return nullptr;
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
- const UpdateCheckCallback& update_check_callback) override {
- return false;
- }
+ const UpdateCheckCallback& update_check_callback) override {}
};
class FakeCrxDownloader : public CrxDownloader {
@@ -2499,7 +2484,7 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
@@ -2529,8 +2514,7 @@
component->SetParseResult(result);
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(update_check_callback, 0, retry_after_sec));
- return true;
+ FROM_HERE, base::BindOnce(update_check_callback, 0, retry_after_sec));
}
};
@@ -2673,7 +2657,7 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
@@ -2768,8 +2752,7 @@
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(update_check_callback, 0, 0));
- return true;
+ FROM_HERE, base::BindOnce(update_check_callback, 0, 0));
}
};
@@ -2808,13 +2791,13 @@
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(&FakeCrxDownloader::OnDownloadProgress,
- base::Unretained(this), result));
+ FROM_HERE, base::BindOnce(&FakeCrxDownloader::OnDownloadProgress,
+ base::Unretained(this), result));
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE,
- base::Bind(&FakeCrxDownloader::OnDownloadComplete,
- base::Unretained(this), true, result, download_metrics));
+ FROM_HERE, base::BindOnce(&FakeCrxDownloader::OnDownloadComplete,
+ base::Unretained(this), true, result,
+ download_metrics));
}
};
@@ -2921,7 +2904,7 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
@@ -2934,9 +2917,7 @@
EXPECT_EQ(1u, components.count(id));
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(update_check_callback, -1, 0));
-
- return true;
+ FROM_HERE, base::BindOnce(update_check_callback, -1, 0));
}
};
@@ -3004,7 +2985,7 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
@@ -3058,8 +3039,7 @@
component->SetParseResult(result);
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(update_check_callback, 0, 0));
- return true;
+ FROM_HERE, base::BindOnce(update_check_callback, 0, 0));
}
};
@@ -3098,9 +3078,9 @@
}
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE,
- base::Bind(&FakeCrxDownloader::OnDownloadComplete,
- base::Unretained(this), true, result, download_metrics));
+ FROM_HERE, base::BindOnce(&FakeCrxDownloader::OnDownloadComplete,
+ base::Unretained(this), true, result,
+ download_metrics));
}
};
@@ -3164,7 +3144,7 @@
return base::MakeUnique<FakeUpdateChecker>();
}
- bool CheckForUpdates(
+ void CheckForUpdates(
const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
@@ -3199,9 +3179,7 @@
component->SetParseResult(result);
base::ThreadTaskRunnerHandle::Get()->PostTask(
- FROM_HERE, base::Bind(update_check_callback, 0, 0));
-
- return true;
+ FROM_HERE, base::BindOnce(update_check_callback, 0, 0));
}
};
@@ -3242,8 +3220,7 @@
scoped_refptr<ComponentUnpacker> component_unpacker = new ComponentUnpacker(
std::vector<uint8_t>(std::begin(gjpm_hash), std::end(gjpm_hash)),
- TestFilePath("runaction_test_win.crx3"), nullptr, nullptr,
- config()->GetSequencedTaskRunner());
+ TestFilePath("runaction_test_win.crx3"), nullptr, nullptr);
component_unpacker->Unpack(base::Bind(
[](base::FilePath* unpack_path, const base::Closure& quit_closure,
