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

chrome/test/ui/ui_layout_test.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 "chrome/test/ui/ui_layout_test.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
+#include "base/string_number_conversions.h"
 #include "base/test/test_file_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 
 #if defined(OS_WIN)
 static const char kPlatformName[] = "chromium-win";
 #elif defined(OS_MACOSX)
@@ skipping 148 matching lines @@
 
 void UILayoutTest::RunLayoutTest(const std::string& test_case_file_name,
                                  int port) {
   SCOPED_TRACE(test_case_file_name.c_str());
 
   ASSERT_TRUE(!layout_test_controller_.empty());
 
   // Creates a new cookie name. We will have to use a new cookie because
   // this function could be called multiple times.
   std::string status_cookie(kTestCompleteCookie);
-  status_cookie += IntToString(test_count_);
+  status_cookie += base::IntToString(test_count_);
   test_count_++;
 
   // Reads the layout test HTML file.
   FilePath test_file_path(layout_test_dir_);
   test_file_path = test_file_path.AppendASCII(test_case_file_name);
   std::string test_html;
   ASSERT_TRUE(file_util::ReadFileToString(test_file_path, &test_html));
 
   // Injects the layout test controller into the test HTML.
   size_t insertion_position = FindInsertPosition(test_html);
@@ skipping 64 matching lines @@
                                       std::string* expected_result_value) {
   FilePath expected_result_path(result_dir_path);
   expected_result_path = expected_result_path.AppendASCII(test_case_file_name);
   expected_result_path = expected_result_path.InsertBeforeExtension(
       FILE_PATH_LITERAL("-expected"));
   expected_result_path =
       expected_result_path.ReplaceExtension(FILE_PATH_LITERAL("txt"));
   return file_util::ReadFileToString(expected_result_path,
                                      expected_result_value);
 }