Move the number conversions from string_util to a new file....

chrome/browser/config_dir_policy_provider_unittest.cc

 // Copyright (c) 2010 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/file_util.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
+#include "base/string_number_conversions.h"
 #include "chrome/browser/config_dir_policy_provider.h"
 #include "chrome/browser/mock_configuration_policy_store.h"
 #include "chrome/common/json_value_serializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class ConfigDirPolicyProviderTest : public testing::Test {
  protected:
   virtual void SetUp() {
     // Determine the directory to use for testing.
     ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_dir_));
@@ skipping 68 matching lines @@
 
 // Test merging values from different files.
 TEST_F(ConfigDirPolicyProviderTest, ReadPrefsMergePrefs) {
   // Write a bunch of data files in order to increase the chance to detect the
   // provider not respecting lexicographic ordering when reading them. Since the
   // filesystem may return files in arbitrary order, there is no way to be sure,
   // but this is better than nothing.
   DictionaryValue test_dict_bar;
   test_dict_bar.SetString(L"HomepageLocation", L"http://bar.com");
   for (unsigned int i = 1; i <= 4; ++i)
-    WriteConfigFile(test_dict_bar, IntToString(i));
+    WriteConfigFile(test_dict_bar, base::IntToString(i));
   DictionaryValue test_dict_foo;
   test_dict_foo.SetString(L"HomepageLocation", L"http://foo.com");
   WriteConfigFile(test_dict_foo, "9");
   for (unsigned int i = 5; i <= 8; ++i)
-    WriteConfigFile(test_dict_bar, IntToString(i));
+    WriteConfigFile(test_dict_bar, base::IntToString(i));
   ConfigDirPolicyProvider provider(test_dir_);
 
   EXPECT_TRUE(provider.Provide(policy_store_.get()));
   const MockConfigurationPolicyStore::PolicyMap& policy_map(
       policy_store_->policy_map());
   EXPECT_EQ(1U, policy_map.size());
   MockConfigurationPolicyStore::PolicyMap::const_iterator entry =
       policy_map.find(ConfigurationPolicyStore::kPolicyHomePage);
   ASSERT_TRUE(entry != policy_map.end());
 
   std::wstring str_value;
   EXPECT_TRUE(entry->second->GetAsString(&str_value));
   EXPECT_EQ(L"http://foo.com", str_value);
 }