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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 388963002: Get rid of the rest of CreateStringValue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tweaks Created 6 years, 5 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
« chrome/browser/policy/cloud/cloud_policy_browsertest.cc ('K') | « components/policy/core/common/policy_loader_win_unittest.cc ('k') | components/policy/core/common/policy_provider_android_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/policy/core/common/policy_map_unittest.cc
diff --git a/components/policy/core/common/policy_map_unittest.cc b/components/policy/core/common/policy_map_unittest.cc
index 4a0dd9fdf9e32db7c7e5a6b5ae980f446b07131a..9dd225e4e443cbb7b26b2d62631de8cb3f4a2143 100644
--- a/components/policy/core/common/policy_map_unittest.cc
+++ b/components/policy/core/common/policy_map_unittest.cc
@@ -51,10 +51,10 @@ scoped_ptr<ExternalDataFetcher> PolicyMapTest::CreateExternalDataFetcher(
TEST_F(PolicyMapTest, SetAndGet) {
PolicyMap map;
- SetPolicy(&map, kTestPolicyName1, base::Value::CreateStringValue("aaa"));
+ SetPolicy(&map, kTestPolicyName1, new base::StringValue("aaa"));
base::StringValue expected("aaa");
EXPECT_TRUE(expected.Equals(map.GetValue(kTestPolicyName1)));
- SetPolicy(&map, kTestPolicyName1, base::Value::CreateStringValue("bbb"));
+ SetPolicy(&map, kTestPolicyName1, new base::StringValue("bbb"));
base::StringValue expected_b("bbb");
EXPECT_TRUE(expected_b.Equals(map.GetValue(kTestPolicyName1)));
SetPolicy(&map, kTestPolicyName1,
@@ -78,13 +78,13 @@ TEST_F(PolicyMapTest, SetAndGet) {
TEST_F(PolicyMapTest, Equals) {
PolicyMap a;
- SetPolicy(&a, kTestPolicyName1, base::Value::CreateStringValue("aaa"));
+ SetPolicy(&a, kTestPolicyName1, new base::StringValue("aaa"));
PolicyMap a2;
- SetPolicy(&a2, kTestPolicyName1, base::Value::CreateStringValue("aaa"));
+ SetPolicy(&a2, kTestPolicyName1, new base::StringValue("aaa"));
PolicyMap b;
- SetPolicy(&b, kTestPolicyName1, base::Value::CreateStringValue("bbb"));
+ SetPolicy(&b, kTestPolicyName1, new base::StringValue("bbb"));
PolicyMap c;
- SetPolicy(&c, kTestPolicyName1, base::Value::CreateStringValue("aaa"));
+ SetPolicy(&c, kTestPolicyName1, new base::StringValue("aaa"));
SetPolicy(&c, kTestPolicyName2, base::Value::CreateBooleanValue(true));
PolicyMap d;
SetPolicy(&d, kTestPolicyName1,
@@ -129,11 +129,11 @@ TEST_F(PolicyMapTest, Equals) {
TEST_F(PolicyMapTest, Swap) {
PolicyMap a;
- SetPolicy(&a, kTestPolicyName1, base::Value::CreateStringValue("aaa"));
+ SetPolicy(&a, kTestPolicyName1, new base::StringValue("aaa"));
SetPolicy(&a, kTestPolicyName2,
CreateExternalDataFetcher("dummy").release());
PolicyMap b;
- SetPolicy(&b, kTestPolicyName1, base::Value::CreateStringValue("bbb"));
+ SetPolicy(&b, kTestPolicyName1, new base::StringValue("bbb"));
SetPolicy(&b, kTestPolicyName3, base::Value::CreateBooleanValue(true));
a.Swap(&b);
@@ -161,8 +161,11 @@ TEST_F(PolicyMapTest, Swap) {
TEST_F(PolicyMapTest, MergeFrom) {
PolicyMap a;
- a.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- base::Value::CreateStringValue("google.com"), NULL);
+ a.Set(kTestPolicyName1,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
+ new base::StringValue("google.com"),
+ NULL);
a.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
base::Value::CreateBooleanValue(true), NULL);
a.Set(kTestPolicyName3,
@@ -171,12 +174,17 @@ TEST_F(PolicyMapTest, MergeFrom) {
a.Set(kTestPolicyName4, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
base::Value::CreateBooleanValue(false), NULL);
a.Set(kTestPolicyName5,
- POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
- base::Value::CreateStringValue("google.com/q={x}"), NULL);
+ POLICY_LEVEL_RECOMMENDED,
+ POLICY_SCOPE_MACHINE,
+ new base::StringValue("google.com/q={x}"),
+ NULL);
PolicyMap b;
- b.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
- base::Value::CreateStringValue("chromium.org"), NULL);
+ b.Set(kTestPolicyName1,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ new base::StringValue("chromium.org"),
+ NULL);
b.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
base::Value::CreateBooleanValue(false), NULL);
b.Set(kTestPolicyName3,
@@ -187,7 +195,7 @@ TEST_F(PolicyMapTest, MergeFrom) {
b.Set(kTestPolicyName5,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE,
- base::Value::CreateStringValue(std::string()),
+ new base::StringValue(std::string()),
NULL);
b.Set(kTestPolicyName6,
POLICY_LEVEL_RECOMMENDED,
@@ -199,8 +207,11 @@ TEST_F(PolicyMapTest, MergeFrom) {
PolicyMap c;
// POLICY_SCOPE_MACHINE over POLICY_SCOPE_USER.
- c.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
- base::Value::CreateStringValue("chromium.org"), NULL);
+ c.Set(kTestPolicyName1,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_MACHINE,
+ new base::StringValue("chromium.org"),
+ NULL);
// |a| has precedence over |b|.
c.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
base::Value::CreateBooleanValue(true), NULL);
@@ -214,7 +225,7 @@ TEST_F(PolicyMapTest, MergeFrom) {
c.Set(kTestPolicyName5,
POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_MACHINE,
- base::Value::CreateStringValue(std::string()),
+ new base::StringValue(std::string()),
NULL);
// Merge new ones.
c.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
@@ -225,8 +236,11 @@ TEST_F(PolicyMapTest, MergeFrom) {
TEST_F(PolicyMapTest, GetDifferingKeys) {
PolicyMap a;
- a.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- base::Value::CreateStringValue("google.com"), NULL);
+ a.Set(kTestPolicyName1,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
+ new base::StringValue("google.com"),
+ NULL);
a.Set(kTestPolicyName2,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
NULL, CreateExternalDataFetcher("dummy").release());
@@ -238,14 +252,19 @@ TEST_F(PolicyMapTest, GetDifferingKeys) {
a.Set(kTestPolicyName5, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
base::Value::CreateBooleanValue(false), NULL);
a.Set(kTestPolicyName6,
- POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
- base::Value::CreateStringValue("google.com/q={x}"), NULL);
+ POLICY_LEVEL_RECOMMENDED,
+ POLICY_SCOPE_MACHINE,
+ new base::StringValue("google.com/q={x}"),
+ NULL);
a.Set(kTestPolicyName7, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
base::Value::CreateBooleanValue(true), NULL);
PolicyMap b;
- b.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- base::Value::CreateStringValue("google.com"), NULL);
+ b.Set(kTestPolicyName1,
+ POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER,
+ new base::StringValue("google.com"),
+ NULL);
b.Set(kTestPolicyName2,
POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
NULL, CreateExternalDataFetcher("dummy").release());
@@ -256,8 +275,10 @@ TEST_F(PolicyMapTest, GetDifferingKeys) {
NULL, CreateExternalDataFetcher("b").release());
b.Set(kTestPolicyName5, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
base::Value::CreateBooleanValue(false), NULL);
- b.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED,
- POLICY_SCOPE_USER, base::Value::CreateStringValue("google.com/q={x}"),
+ b.Set(kTestPolicyName6,
+ POLICY_LEVEL_RECOMMENDED,
+ POLICY_SCOPE_USER,
+ new base::StringValue("google.com/q={x}"),
NULL);
b.Set(kTestPolicyName8, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
base::Value::CreateBooleanValue(true), NULL);
« chrome/browser/policy/cloud/cloud_policy_browsertest.cc ('K') | « components/policy/core/common/policy_loader_win_unittest.cc ('k') | components/policy/core/common/policy_provider_android_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698