diff options
-rw-r--r-- | components/policy/core/common/config_dir_policy_loader_unittest.cc | 7 | ||||
-rw-r--r-- | components/policy/core/common/plist_writer.cc | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/components/policy/core/common/config_dir_policy_loader_unittest.cc b/components/policy/core/common/config_dir_policy_loader_unittest.cc index 1f3d4347f1..d6b21a54e2 100644 --- a/components/policy/core/common/config_dir_policy_loader_unittest.cc +++ b/components/policy/core/common/config_dir_policy_loader_unittest.cc @@ -155,7 +155,8 @@ void TestHarness::WriteConfigFile(const base::DictionaryValue& dict, std::string TestHarness::NextConfigFileName() { EXPECT_LE(next_policy_file_index_, 999); - return std::string("policy") + base::IntToString(next_policy_file_index_++); + return std::string("policy") + + base::NumberToString(next_policy_file_index_++); } // static @@ -224,12 +225,12 @@ TEST_F(ConfigDirPolicyLoaderTest, ReadPrefsMergePrefs) { const char kHomepageLocation[] = "HomepageLocation"; test_dict_bar.SetString(kHomepageLocation, "http://bar.com"); for (unsigned int i = 1; i <= 4; ++i) - harness_.WriteConfigFile(test_dict_bar, base::UintToString(i)); + harness_.WriteConfigFile(test_dict_bar, base::NumberToString(i)); base::DictionaryValue test_dict_foo; test_dict_foo.SetString(kHomepageLocation, "http://foo.com"); harness_.WriteConfigFile(test_dict_foo, "9"); for (unsigned int i = 5; i <= 8; ++i) - harness_.WriteConfigFile(test_dict_bar, base::UintToString(i)); + harness_.WriteConfigFile(test_dict_bar, base::NumberToString(i)); ConfigDirPolicyLoader loader( scoped_task_environment_.GetMainThreadTaskRunner(), harness_.test_dir(), diff --git a/components/policy/core/common/plist_writer.cc b/components/policy/core/common/plist_writer.cc index 68c1db5494..77b8002614 100644 --- a/components/policy/core/common/plist_writer.cc +++ b/components/policy/core/common/plist_writer.cc @@ -26,7 +26,7 @@ bool BuildPlistString(const base::Value& node, XmlWriter& plist_writer) { case base::Value::Type::INTEGER: { int value = node.GetInt(); - plist_writer.WriteElement("integer", base::IntToString(value)); + plist_writer.WriteElement("integer", base::NumberToString(value)); return true; } |