Remove more CreateIntegerValue calls.

components/policy/core/browser/configuration_policy_handler_unittest.cc

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
@@ skipping 112 matching lines @@
 
 TEST(IntRangePolicyHandler, CheckPolicySettingsClamp) {
   PolicyMap policy_map;
   PolicyErrorMap errors;
 
   // This tests needs to modify an int policy. The exact policy used and its
   // semantics outside the test are irrelevant.
   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());
 
   // 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);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
 }
 
 TEST(IntRangePolicyHandler, CheckPolicySettingsDontClamp) {
   PolicyMap policy_map;
   PolicyErrorMap errors;
 
   // This tests needs to modify an int policy. The exact policy used and its
   // semantics outside the test are irrelevant.
   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);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
 }
 
 TEST(IntRangePolicyHandler, ApplyPolicySettingsClamp) {
   PolicyMap policy_map;
   PrefValueMap prefs;
   scoped_ptr<base::Value> expected;
   const base::Value* value;
 
   // This tests needs to modify an int policy. The exact policy used and its
   // semantics outside the test are irrelevant.
   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));
 }
 
 TEST(IntRangePolicyHandler, ApplyPolicySettingsDontClamp) {
   PolicyMap policy_map;
   PrefValueMap prefs;
   scoped_ptr<base::Value> expected;
   const base::Value* value;
 
   // This tests needs to modify an int policy. The exact policy used and its
   // semantics outside the test are irrelevant.
   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));
 }
 
 TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsClamp) {
   PolicyMap policy_map;
   PolicyErrorMap errors;
 
   // This tests needs to modify an int policy. The exact policy used and its
   // semantics outside the test are irrelevant.
   IntPercentageToDoublePolicyHandler 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());
 
   // 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);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
 }
 
 TEST(IntPercentageToDoublePolicyHandler, CheckPolicySettingsDontClamp) {
   PolicyMap policy_map;
   PolicyErrorMap errors;
 
   // This tests needs to modify an int policy. The exact policy used and its
   // semantics outside the test are irrelevant.
   IntPercentageToDoublePolicyHandler 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);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
 }
 
 TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsClamp) {
   PolicyMap policy_map;
   PrefValueMap prefs;
   scoped_ptr<base::Value> expected;
   const base::Value* value;
 
   // This tests needs to modify an int policy. The exact policy used and its
   // semantics outside the test are irrelevant.
   IntPercentageToDoublePolicyHandler 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::CreateDoubleValue(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));
   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));
   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));
   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));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 }
 
 TEST(IntPercentageToDoublePolicyHandler, ApplyPolicySettingsDontClamp) {
   PolicyMap policy_map;
   PrefValueMap prefs;
   scoped_ptr<base::Value> expected;
   const base::Value* value;
 
   // This tests needs to modify an int policy. The exact policy used and its
   // semantics outside the test are irrelevant.
   IntPercentageToDoublePolicyHandler 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::CreateDoubleValue(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));
   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));
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value));
   EXPECT_TRUE(base::Value::Equals(expected.get(), value));
 }
 
 TEST(SchemaValidatingPolicyHandlerTest, CheckAndGetValue) {
   std::string error;
   static const char kSchemaJson[] =
@@ skipping 177 matching lines @@
   handler_recommended.ApplyPolicySettings(policy_map_mandatory, &prefs);
   EXPECT_TRUE(prefs.GetValue(kTestPref, &value_set_in_pref));
   EXPECT_TRUE(value_expected_in_pref->Equals(value_set_in_pref));
 
   EXPECT_FALSE(
       handler_none.CheckPolicySettings(policy_map_recommended, &errors));
   EXPECT_FALSE(errors.empty());
 }
 
 }  // namespace policy