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

Unified Diff: components/policy/core/common/policy_loader_win_unittest.cc

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 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
Index: components/policy/core/common/policy_loader_win_unittest.cc
diff --git a/components/policy/core/common/policy_loader_win_unittest.cc b/components/policy/core/common/policy_loader_win_unittest.cc
index 1e06bd827cb0dea83ed74066336db5c751bcf869..df67893b34a9731228488522055c5d167910990f 100644
--- a/components/policy/core/common/policy_loader_win_unittest.cc
+++ b/components/policy/core/common/policy_loader_win_unittest.cc
@@ -812,7 +812,7 @@ TEST_F(PolicyLoaderWinTest, HKLMOverHKCU) {
PolicyBundle expected;
expected.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
.Set(test_keys::kKeyString, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
- POLICY_SOURCE_PLATFORM, base::MakeUnique<base::StringValue>("hklm"),
+ POLICY_SOURCE_PLATFORM, base::MakeUnique<base::Value>("hklm"),
nullptr);
EXPECT_TRUE(Matches(expected));
}
@@ -865,17 +865,17 @@ TEST_F(PolicyLoaderWinTest, Merge3rdPartyPolicies) {
PolicyMap& expected_policy = expected.Get(ns);
expected_policy.Set(
"a", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, POLICY_SOURCE_PLATFORM,
- base::MakeUnique<base::StringValue>(kMachineMandatory), nullptr);
- expected_policy.Set(
- "b", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_PLATFORM,
- base::MakeUnique<base::StringValue>(kUserMandatory), nullptr);
+ base::MakeUnique<base::Value>(kMachineMandatory), nullptr);
+ expected_policy.Set("b", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_PLATFORM,
+ base::MakeUnique<base::Value>(kUserMandatory), nullptr);
expected_policy.Set("c", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
POLICY_SOURCE_PLATFORM,
- base::MakeUnique<base::StringValue>(kMachineRecommended),
+ base::MakeUnique<base::Value>(kMachineRecommended),
nullptr);
- expected_policy.Set(
- "d", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, POLICY_SOURCE_PLATFORM,
- base::MakeUnique<base::StringValue>(kUserRecommended), nullptr);
+ expected_policy.Set("d", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
+ POLICY_SOURCE_PLATFORM,
+ base::MakeUnique<base::Value>(kUserRecommended), nullptr);
EXPECT_TRUE(Matches(expected));
}
« no previous file with comments | « components/policy/core/common/policy_loader_mac_unittest.cc ('k') | components/policy/core/common/policy_map_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698