Index: chrome/browser/policy/policy_map_unittest.cc |
diff --git a/chrome/browser/policy/policy_map_unittest.cc b/chrome/browser/policy/policy_map_unittest.cc |
index eb54400c66c5da051813ae6b118ead03d048134e..2ca4dd6abb132c2b15723e96eae3beb445033c69 100644 |
--- a/chrome/browser/policy/policy_map_unittest.cc |
+++ b/chrome/browser/policy/policy_map_unittest.cc |
@@ -12,24 +12,24 @@ namespace policy { |
TEST(PolicyMapTest, SetAndGet) { |
PolicyMap map; |
- map.Set(kPolicyHomepageLocation, Value::CreateStringValue("aaa")); |
+ map.Set(kPolicyHomepageLocation, base::StringValue::New("aaa")); |
StringValue expected("aaa"); |
EXPECT_TRUE(expected.Equals(map.Get(kPolicyHomepageLocation))); |
- map.Set(kPolicyHomepageLocation, Value::CreateStringValue("bbb")); |
+ map.Set(kPolicyHomepageLocation, base::StringValue::New("bbb")); |
StringValue expected_b("bbb"); |
EXPECT_TRUE(expected_b.Equals(map.Get(kPolicyHomepageLocation))); |
} |
TEST(PolicyMapTest, Equals) { |
PolicyMap a; |
- a.Set(kPolicyHomepageLocation, Value::CreateStringValue("aaa")); |
+ a.Set(kPolicyHomepageLocation, base::StringValue::New("aaa")); |
PolicyMap a2; |
- a2.Set(kPolicyHomepageLocation, Value::CreateStringValue("aaa")); |
+ a2.Set(kPolicyHomepageLocation, base::StringValue::New("aaa")); |
PolicyMap b; |
- b.Set(kPolicyHomepageLocation, Value::CreateStringValue("bbb")); |
+ b.Set(kPolicyHomepageLocation, base::StringValue::New("bbb")); |
PolicyMap c; |
- c.Set(kPolicyHomepageLocation, Value::CreateStringValue("aaa")); |
- c.Set(kPolicyHomepageIsNewTabPage, Value::CreateBooleanValue(true)); |
+ c.Set(kPolicyHomepageLocation, base::StringValue::New("aaa")); |
+ c.Set(kPolicyHomepageIsNewTabPage, base::TrueValue()); |
EXPECT_FALSE(a.Equals(b)); |
EXPECT_FALSE(b.Equals(a)); |
EXPECT_FALSE(a.Equals(c)); |
@@ -46,14 +46,14 @@ TEST(PolicyMapTest, Equals) { |
TEST(PolicyMapTest, Swap) { |
PolicyMap a; |
- a.Set(kPolicyHomepageLocation, Value::CreateStringValue("aaa")); |
+ a.Set(kPolicyHomepageLocation, base::StringValue::New("aaa")); |
PolicyMap b; |
- b.Set(kPolicyHomepageLocation, Value::CreateStringValue("bbb")); |
- b.Set(kPolicyHomepageIsNewTabPage, Value::CreateBooleanValue(true)); |
+ b.Set(kPolicyHomepageLocation, base::StringValue::New("bbb")); |
+ b.Set(kPolicyHomepageIsNewTabPage, base::TrueValue()); |
a.Swap(&b); |
base::StringValue expected("bbb"); |
EXPECT_TRUE(expected.Equals(a.Get(kPolicyHomepageLocation))); |
- base::FundamentalValue expected_bool(true); |
+ base::BooleanValue expected_bool(true); |
EXPECT_TRUE(expected_bool.Equals(a.Get(kPolicyHomepageIsNewTabPage))); |
StringValue expected_a("aaa"); |
EXPECT_TRUE(expected_a.Equals(b.Get(kPolicyHomepageLocation))); |