Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1212)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/update_client/update_checker_unittest.cc

Issue 2873533002: Prepare to abstract PersistedData by making it part of the configurator.
Patch Set: Really fix a compile error in iOS component configurator this time. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« components/update_client/update_checker.cc ('K') | « components/update_client/update_checker.cc ('k') | components/update_client/update_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/update_client/update_checker_unittest.cc
diff --git a/components/update_client/update_checker_unittest.cc b/components/update_client/update_checker_unittest.cc
index 6546206f1ba14c61e002f99ed980f5166fdc705b..879099ae4f24ef50883966c684d2d0a4e67074d0 100644
--- a/components/update_client/update_checker_unittest.cc
+++ b/components/update_client/update_checker_unittest.cc
@@ -69,7 +69,6 @@ class UpdateCheckerTest : public testing::Test {
scoped_refptr<TestConfigurator> config_;
std::unique_ptr<TestingPrefServiceSimple> pref_;
- std::unique_ptr<PersistedData> metadata_;
std::unique_ptr<UpdateChecker> update_checker_;
@@ -98,11 +97,11 @@ UpdateCheckerTest::~UpdateCheckerTest() {
}
void UpdateCheckerTest::SetUp() {
+ pref_ = base::MakeUnique<TestingPrefServiceSimple>();
config_ = base::MakeShared<TestConfigurator>(
base::ThreadTaskRunnerHandle::Get(), base::ThreadTaskRunnerHandle::Get());
- pref_ = base::MakeUnique<TestingPrefServiceSimple>();
+ config_->SetPrefService(pref_.get());
PersistedData::RegisterPrefs(pref_->registry());
- metadata_ = base::MakeUnique<PersistedData>(pref_.get());
interceptor_factory_ =
base::MakeUnique<InterceptorFactory>(base::ThreadTaskRunnerHandle::Get());
post_interceptor_ = interceptor_factory_->CreateInterceptor();
@@ -182,7 +181,7 @@ TEST_F(UpdateCheckerTest, UpdateCheckSuccess) {
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
- update_checker_ = UpdateChecker::Create(config_, metadata_.get());
+ update_checker_ = UpdateChecker::Create(config_);
IdToComponentPtrMap components;
components[kUpdateItemId] = MakeComponent();
@@ -250,7 +249,7 @@ TEST_F(UpdateCheckerTest, UpdateCheckInvalidAp) {
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
- update_checker_ = UpdateChecker::Create(config_, metadata_.get());
+ update_checker_ = UpdateChecker::Create(config_);
IdToComponentPtrMap components;
components[kUpdateItemId] = MakeComponent();
@@ -280,7 +279,7 @@ TEST_F(UpdateCheckerTest, UpdateCheckSuccessNoBrand) {
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
config_->SetBrand("TOOLONG"); // Sets an invalid brand code.
- update_checker_ = UpdateChecker::Create(config_, metadata_.get());
+ update_checker_ = UpdateChecker::Create(config_);
IdToComponentPtrMap components;
components[kUpdateItemId] = MakeComponent();
@@ -306,7 +305,7 @@ TEST_F(UpdateCheckerTest, UpdateCheckError) {
EXPECT_TRUE(
post_interceptor_->ExpectRequest(new PartialMatch("updatecheck"), 403));
- update_checker_ = UpdateChecker::Create(config_, metadata_.get());
+ update_checker_ = UpdateChecker::Create(config_);
IdToComponentPtrMap components;
components[kUpdateItemId] = MakeComponent();
@@ -334,7 +333,7 @@ TEST_F(UpdateCheckerTest, UpdateCheckDownloadPreference) {
config_->SetDownloadPreference(string("cacheable"));
- update_checker_ = UpdateChecker::Create(config_, metadata_.get());
+ update_checker_ = UpdateChecker::Create(config_);
IdToComponentPtrMap components;
components[kUpdateItemId] = MakeComponent();
@@ -360,7 +359,7 @@ TEST_F(UpdateCheckerTest, UpdateCheckCupError) {
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
config_->SetEnabledCupSigning(true);
- update_checker_ = UpdateChecker::Create(config_, metadata_.get());
+ update_checker_ = UpdateChecker::Create(config_);
IdToComponentPtrMap components;
components[kUpdateItemId] = MakeComponent();
@@ -398,7 +397,7 @@ TEST_F(UpdateCheckerTest, UpdateCheckCupError) {
TEST_F(UpdateCheckerTest, UpdateCheckRequiresEncryptionError) {
config_->SetUpdateCheckUrl(GURL("http:\\foo\bar"));
- update_checker_ = UpdateChecker::Create(config_, metadata_.get());
+ update_checker_ = UpdateChecker::Create(config_);
IdToComponentPtrMap components;
components[kUpdateItemId] = MakeComponent();
@@ -424,7 +423,7 @@ TEST_F(UpdateCheckerTest, UpdateCheckDateLastRollCall) {
EXPECT_TRUE(post_interceptor_->ExpectRequest(
new PartialMatch("updatecheck"), test_file("updatecheck_reply_4.xml")));
- update_checker_ = UpdateChecker::Create(config_, metadata_.get());
+ update_checker_ = UpdateChecker::Create(config_);
IdToComponentPtrMap components;
components[kUpdateItemId] = MakeComponent();
@@ -437,7 +436,7 @@ TEST_F(UpdateCheckerTest, UpdateCheckDateLastRollCall) {
base::Unretained(this)));
RunThreads();
- update_checker_ = UpdateChecker::Create(config_, metadata_.get());
+ update_checker_ = UpdateChecker::Create(config_);
update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "extra=\"params\"",
true,
@@ -460,7 +459,7 @@ TEST_F(UpdateCheckerTest, UpdateCheckUpdateDisabled) {
new PartialMatch("updatecheck"), test_file("updatecheck_reply_1.xml")));
config_->SetBrand("");
- update_checker_ = UpdateChecker::Create(config_, metadata_.get());
+ update_checker_ = UpdateChecker::Create(config_);
IdToComponentPtrMap components;
components[kUpdateItemId] = MakeComponent();
@@ -491,7 +490,7 @@ TEST_F(UpdateCheckerTest, UpdateCheckUpdateDisabled) {
// Expects the update check to include the "updatedisabled" attribute.
component->crx_component_.supports_group_policy_enable_component_updates =
true;
- update_checker_ = UpdateChecker::Create(config_, metadata_.get());
+ update_checker_ = UpdateChecker::Create(config_);
update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", false,
base::Bind(&UpdateCheckerTest::UpdateCheckComplete,
@@ -508,7 +507,7 @@ TEST_F(UpdateCheckerTest, UpdateCheckUpdateDisabled) {
// Expects the update check to not include the "updatedisabled" attribute.
component->crx_component_.supports_group_policy_enable_component_updates =
false;
- update_checker_ = UpdateChecker::Create(config_, metadata_.get());
+ update_checker_ = UpdateChecker::Create(config_);
update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", true,
base::Bind(&UpdateCheckerTest::UpdateCheckComplete,
@@ -525,7 +524,7 @@ TEST_F(UpdateCheckerTest, UpdateCheckUpdateDisabled) {
// Expects the update check to not include the "updatedisabled" attribute.
component->crx_component_.supports_group_policy_enable_component_updates =
true;
- update_checker_ = UpdateChecker::Create(config_, metadata_.get());
+ update_checker_ = UpdateChecker::Create(config_);
update_checker_->CheckForUpdates(
std::vector<std::string>{kUpdateItemId}, components, "", true,
base::Bind(&UpdateCheckerTest::UpdateCheckComplete,
@@ -542,7 +541,7 @@ TEST_F(UpdateCheckerTest, NoUpdateActionRun) {
new PartialMatch("updatecheck"),
test_file("updatecheck_reply_noupdate.xml")));
- update_checker_ = UpdateChecker::Create(config_, metadata_.get());
+ update_checker_ = UpdateChecker::Create(config_);
IdToComponentPtrMap components;
components[kUpdateItemId] = MakeComponent();
« components/update_client/update_checker.cc ('K') | « components/update_client/update_checker.cc ('k') | components/update_client/update_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698