more changes

chrome/browser/policy/user_policy_cache_unittest.cc

Index: chrome/browser/policy/user_policy_cache_unittest.cc
diff --git a/chrome/browser/policy/user_policy_cache_unittest.cc b/chrome/browser/policy/user_policy_cache_unittest.cc
index 702dbee02849776915985676d419d848daebe931..ce2eac436e7f5db83bd924b78c5bdb7d40c8285c 100644
--- a/chrome/browser/policy/user_policy_cache_unittest.cc
+++ b/chrome/browser/policy/user_policy_cache_unittest.cc
@@ -153,10 +153,10 @@ TEST_F(UserPolicyCacheTest, DecodePolicy) {
   DecodePolicy(settings, &mandatory_policy, &recommended_policy);
   PolicyMap mandatory;
   mandatory.Set(kPolicyHomepageLocation,
-                Value::CreateStringValue("chromium.org"));
-  mandatory.Set(kPolicyJavascriptEnabled, Value::CreateBooleanValue(true));
+                base::StringValue::New("chromium.org"));
+  mandatory.Set(kPolicyJavascriptEnabled, base::TrueValue());
   PolicyMap recommended;
-  recommended.Set(kPolicyPolicyRefreshRate, Value::CreateIntegerValue(5));
+  recommended.Set(kPolicyPolicyRefreshRate, base::NumberValue::New(5));
   EXPECT_TRUE(mandatory.Equals(mandatory_policy));
   EXPECT_TRUE(recommended.Equals(recommended_policy));
 }
@@ -167,21 +167,21 @@ TEST_F(UserPolicyCacheTest, DecodeIntegerValue) {
   scoped_ptr<Value> value(
       DecodeIntegerValue(static_cast<google::protobuf::int64>(42)));
   ASSERT_TRUE(value.get());
-  base::FundamentalValue expected_42(42);
+  base::NumberValue expected_42(42);
   EXPECT_TRUE(value->Equals(&expected_42));
   value.reset(
       DecodeIntegerValue(static_cast<google::protobuf::int64>(min - 1LL)));
   EXPECT_EQ(NULL, value.get());
   value.reset(DecodeIntegerValue(static_cast<google::protobuf::int64>(min)));
   ASSERT_TRUE(value.get());
-  base::FundamentalValue expected_min(min);
+  base::NumberValue expected_min(min);
   EXPECT_TRUE(value->Equals(&expected_min));
   value.reset(
       DecodeIntegerValue(static_cast<google::protobuf::int64>(max + 1LL)));
   EXPECT_EQ(NULL, value.get());
   value.reset(DecodeIntegerValue(static_cast<google::protobuf::int64>(max)));
   ASSERT_TRUE(value.get());
-  base::FundamentalValue expected_max(max);
+  base::NumberValue expected_max(max);
   EXPECT_TRUE(value->Equals(&expected_max));
 }
 
@@ -191,8 +191,8 @@ TEST_F(UserPolicyCacheTest, DecodeStringList) {
   string_list.add_entries("more ponies");
   scoped_ptr<ListValue> decoded(DecodeStringList(string_list));
   ListValue expected;
-  expected.Append(Value::CreateStringValue("ponies"));
-  expected.Append(Value::CreateStringValue("more ponies"));
+  expected.Append(base::StringValue::New("ponies"));
+  expected.Append(base::StringValue::New("more ponies"));
   EXPECT_TRUE(decoded->Equals(&expected));
 }
 
@@ -252,7 +252,7 @@ TEST_F(UserPolicyCacheTest, LoadWithData) {
   loop_.RunAllPending();
   PolicyMap expected;
   expected.Set(kPolicyHomepageLocation,
-               Value::CreateStringValue("http://www.example.com"));
+               base::StringValue::New("http://www.example.com"));
   EXPECT_TRUE(expected.Equals(mandatory_policy(cache)));
 }
 
@@ -270,7 +270,7 @@ TEST_F(UserPolicyCacheTest, SetPolicy) {
   SetPolicy(&cache, policy2, false);
   PolicyMap expected;
   expected.Set(kPolicyHomepageLocation,
-               Value::CreateStringValue("http://www.example.com"));
+               base::StringValue::New("http://www.example.com"));
   PolicyMap empty;
   EXPECT_TRUE(expected.Equals(mandatory_policy(cache)));
   EXPECT_TRUE(empty.Equals(recommended_policy(cache)));
@@ -292,7 +292,7 @@ TEST_F(UserPolicyCacheTest, ResetPolicy) {
   SetPolicy(&cache, policy, true);
   PolicyMap expected;
   expected.Set(kPolicyHomepageLocation,
-               Value::CreateStringValue("http://www.example.com"));
+               base::StringValue::New("http://www.example.com"));
   EXPECT_TRUE(expected.Equals(mandatory_policy(cache)));
 
   em::PolicyFetchResponse* empty_policy =
@@ -321,7 +321,7 @@ TEST_F(UserPolicyCacheTest, PersistPolicy) {
   loop_.RunAllPending();
   PolicyMap expected;
   expected.Set(kPolicyHomepageLocation,
-               Value::CreateStringValue("http://www.example.com"));
+               base::StringValue::New("http://www.example.com"));
   EXPECT_TRUE(expected.Equals(mandatory_policy(cache)));
 }
 
@@ -343,7 +343,7 @@ TEST_F(UserPolicyCacheTest, FreshPolicyOverride) {
   loop_.RunAllPending();
   PolicyMap expected;
   expected.Set(kPolicyHomepageLocation,
-               Value::CreateStringValue("http://www.chromium.org"));
+               base::StringValue::New("http://www.chromium.org"));
   EXPECT_TRUE(expected.Equals(mandatory_policy(cache)));
 }
 
@@ -371,7 +371,7 @@ TEST_F(UserPolicyCacheTest, OldStylePolicy) {
   SetPolicy(&cache, policy, true);
   PolicyMap expected;
   expected.Set(kPolicyHomepageLocation,
-               Value::CreateStringValue("http://www.example.com"));
+               base::StringValue::New("http://www.example.com"));
   PolicyMap empty;
   EXPECT_TRUE(expected.Equals(mandatory_policy(cache)));
   EXPECT_TRUE(empty.Equals(recommended_policy(cache)));