3 files changed, 8 insertions, 7 deletions
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc
index 440faf2..253532d 100644
--- a/chrome/test/ui/npapi_uitest.cc
+++ b/chrome/test/ui/npapi_uitest.cc
@@ -21,6 +21,7 @@
 
 #include "base/file_path.h"
 #include "base/keyboard_codes.h"
+#include "base/string_number_conversions.h"
 #include "chrome/browser/net/url_request_mock_http_job.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
@@ -54,7 +55,7 @@ TEST_F(NPAPITester, FLAKY_ManyPlugins) {
 
   for (int i = 1; i <= 15; i++) {
     SCOPED_TRACE(StringPrintf("Waiting for plugin #%d", i));
-    ASSERT_NO_FATAL_FAILURE(WaitForFinish("arguments", IntToString(i),
+    ASSERT_NO_FATAL_FAILURE(WaitForFinish("arguments", base::IntToString(i),
                                           url, kTestCompleteCookie,
                                           kTestCompleteSuccess,
                                           action_max_timeout_ms()));
diff --git a/chrome/test/ui/ui_layout_test.cc b/chrome/test/ui/ui_layout_test.cc
index 6c5415f..59486f6 100644
--- a/chrome/test/ui/ui_layout_test.cc
+++ b/chrome/test/ui/ui_layout_test.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -6,7 +6,7 @@
 
 #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"
@@ -175,7 +175,7 @@ void UILayoutTest::RunLayoutTest(const std::string& test_case_file_name,
   // 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.
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index dde980e..e29c373 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -22,7 +22,7 @@
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_temp_dir.h"
-#include "base/string_util.h"
+#include "base/string_number_conversions.h"
 #include "base/test/test_file_util.h"
 #include "base/time.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ -738,7 +738,7 @@ DictionaryValue* UITestBase::GetLocalState() {
 DictionaryValue* UITestBase::GetDefaultProfilePreferences() {
   FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
-  path = path.AppendASCII(WideToASCII(chrome::kNotSignedInProfile));
+  path = path.AppendASCII(WideToUTF8(chrome::kNotSignedInProfile));
   return LoadDictionaryValueFromPath(path.Append(chrome::kPreferencesFilename));
 }
 
@@ -1228,7 +1228,7 @@ void UITestBase::UpdateHistoryDates() {
 
   ASSERT_TRUE(db.Open(history));
   Time yesterday = Time::Now() - TimeDelta::FromDays(1);
-  std::string yesterday_str = Int64ToString(yesterday.ToInternalValue());
+  std::string yesterday_str = base::Int64ToString(yesterday.ToInternalValue());
   std::string query = StringPrintf(
       "UPDATE segment_usage "
       "SET time_slot = %s "