Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / components / policy / core / browser / configuration_policy_handler_unittest.cc

diff --git a/src/components/policy/core/browser/configuration_policy_handler_unittest.cc b/src/components/policy/core/browser/configuration_policy_handler_unittest.cc
index 51a47f8..a969219 100644 (file)
--- a/src/components/policy/core/browser/configuration_policy_handler_unittest.cc
+++ b/src/components/policy/core/browser/configuration_policy_handler_unittest.cc
@@ -79,9 +79,11 @@ TEST(StringToIntEnumListPolicyHandlerTest, CheckPolicySettings) {
   EXPECT_FALSE(errors.empty());
   EXPECT_FALSE(errors.GetErrors(kTestPolicy).empty());
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER,
-                 base::Value::CreateStringValue("no list"), NULL);
+                 new base::StringValue("no list"),
+                 NULL);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
@@ -130,34 +132,49 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsClamp) {
   IntRangePolicyHandler handler(kTestPolicy, kTestPref, 0, 10, true);
 
   // Check that values lying in the accepted range are not rejected.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(0), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(0),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(5), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(5),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(10), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(10),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
   // Check that values lying outside the accepted range are not rejected
   // (because clamping is enabled) but do yield a warning message.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(-5), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(-5),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(15), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(15),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
@@ -165,8 +182,10 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsClamp) {
   // Check that an entirely invalid value is rejected and yields an error
   // message.
   policy_map.Set(kTestPolicy,
-                 POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                 base::Value::CreateStringValue("invalid"), NULL);
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::StringValue("invalid"),
+                 NULL);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
@@ -181,42 +200,60 @@ TEST(IntRangePolicyHandler, CheckPolicySettingsDontClamp) {
   IntRangePolicyHandler handler(kTestPolicy, kTestPref, 0, 10, false);
 
   // Check that values lying in the accepted range are not rejected.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(0), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(0),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(5), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(5),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(10), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(10),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
   // Check that values lying outside the accepted range are rejected and yield
   // an error message.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(-5), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(-5),
+                 NULL);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(15), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(15),
+                 NULL);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
 
   // Check that an entirely invalid value is rejected and yields an error
   // message.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                 base::Value::CreateStringValue("invalid"), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::StringValue("invalid"),
+                 NULL);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
@@ -233,45 +270,60 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsClamp) {
   IntRangePolicyHandler handler(kTestPolicy, kTestPref, 0, 10, true);
 
   // Check that values lying in the accepted range are written to the pref.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(0), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(0),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateIntegerValue(0));
+  expected.reset(new base::FundamentalValue(0));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(5), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(5),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateIntegerValue(5));
+  expected.reset(new base::FundamentalValue(5));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(10), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(10),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateIntegerValue(10));
+  expected.reset(new base::FundamentalValue(10));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 
   // Check that values lying outside the accepted range are clamped and written
   // to the pref.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(-5), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(-5),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateIntegerValue(0));
+  expected.reset(new base::FundamentalValue(0));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(15), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(15),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateIntegerValue(10));
+  expected.reset(new base::FundamentalValue(10));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 }
@@ -287,27 +339,36 @@ TEST(IntRangePolicyHandler, ApplyPolicySettingsDontClamp) {
   IntRangePolicyHandler handler(kTestPolicy, kTestPref, 0, 10, true);
 
   // Check that values lying in the accepted range are written to the pref.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(0), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(0),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateIntegerValue(0));
+  expected.reset(new base::FundamentalValue(0));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(5), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(5),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateIntegerValue(5));
+  expected.reset(new base::FundamentalValue(5));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(10), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(10),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateIntegerValue(10));
+  expected.reset(new base::FundamentalValue(10));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 }
@@ -322,42 +383,60 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsClamp) {
       kTestPolicy, kTestPref, 0, 10, true);
 
   // Check that values lying in the accepted range are not rejected.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(0), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(0),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(5), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(5),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(10), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(10),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
   // Check that values lying outside the accepted range are not rejected
   // (because clamping is enabled) but do yield a warning message.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(-5), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(-5),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(15), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(15),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
 
   // Check that an entirely invalid value is rejected and yields an error
   // message.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                 base::Value::CreateStringValue("invalid"), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::StringValue("invalid"),
+                 NULL);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
@@ -373,42 +452,60 @@ TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsDontClamp) {
       kTestPolicy, kTestPref, 0, 10, false);
 
   // Check that values lying in the accepted range are not rejected.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(0), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(0),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(5), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(5),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(10), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(10),
+                 NULL);
   errors.Clear();
   EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_TRUE(errors.empty());
 
   // Check that values lying outside the accepted range are rejected and yield
   // an error message.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(-5), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(-5),
+                 NULL);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(15), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(15),
+                 NULL);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
 
   // Check that an entirely invalid value is rejected and yields an error
   // message.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                 base::Value::CreateStringValue("invalid"), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::StringValue("invalid"),
+                 NULL);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
@@ -426,45 +523,60 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsClamp) {
       kTestPolicy, kTestPref, 0, 10, true);
 
   // Check that values lying in the accepted range are written to the pref.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(0), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(0),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateDoubleValue(0.0));
+  expected.reset(new base::FundamentalValue(0.0));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(5), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(5),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateDoubleValue(0.05));
+  expected.reset(new base::FundamentalValue(0.05));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(10), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(10),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateDoubleValue(0.1));
+  expected.reset(new base::FundamentalValue(0.1));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 
   // Check that values lying outside the accepted range are clamped and written
   // to the pref.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(-5), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(-5),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateDoubleValue(0.0));
+  expected.reset(new base::FundamentalValue(0.0));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(15), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(15),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateDoubleValue(0.1));
+  expected.reset(new base::FundamentalValue(0.1));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 }
@@ -481,27 +593,36 @@ TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsDontClamp) {
       kTestPolicy, kTestPref, 0, 10, true);
 
   // Check that values lying in the accepted range are written to the pref.
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(0), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(0),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateDoubleValue(0.0));
+  expected.reset(new base::FundamentalValue(0.0));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(5), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(5),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateDoubleValue(0.05));
+  expected.reset(new base::FundamentalValue(0.05));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 
-  policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY,
-                 POLICY_SCOPE_USER, base::Value::CreateIntegerValue(10), NULL);
+  policy_map.Set(kTestPolicy,
+                 POLICY_LEVEL_MANDATORY,
+                 POLICY_SCOPE_USER,
+                 new base::FundamentalValue(10),
+                 NULL);
   prefs.Clear();
   handler.ApplyPolicySettings(policy_map, &prefs);
-  expected.reset(base::Value::CreateDoubleValue(0.1));
+  expected.reset(new base::FundamentalValue(0.1));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 }