summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 15:29:29 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 15:29:29 +0000
commit5713f3265b87f12432a31c4a90e59b5f3f2f8f7e (patch)
treee245d2a81d970f72505a92966f3d4a6cc0c62917 /chrome_frame/test
parentb1a71cc2cce3c8bcd94ebbe22deee5117a725125 (diff)
downloadchromium_src-5713f3265b87f12432a31c4a90e59b5f3f2f8f7e.zip
chromium_src-5713f3265b87f12432a31c4a90e59b5f3f2f8f7e.tar.gz
chromium_src-5713f3265b87f12432a31c4a90e59b5f3f2f8f7e.tar.bz2
Fix the Windows build.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
-rw-r--r--chrome_frame/test/reliability/page_load_test.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc
index d0f8767..f784bcf 100644
--- a/chrome_frame/test/reliability/page_load_test.cc
+++ b/chrome_frame/test/reliability/page_load_test.cc
@@ -32,6 +32,7 @@
#include "base/i18n/time_formatting.h"
#include "base/path_service.h"
#include "base/registry.h"
+#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/test/test_file_util.h"
#include "base/time.h"
@@ -396,7 +397,7 @@ class PageLoadTest : public testing::Test {
FilePath ConstructSavedDebugLogPath(const FilePath& debug_log_path,
int index) {
std::string suffix("_");
- suffix.append(IntToString(index));
+ suffix.append(base::IntToString(index));
return debug_log_path.InsertBeforeExtensionASCII(suffix);
}
@@ -561,14 +562,14 @@ void SetPageRange(const CommandLine& parsed_command_line) {
if (parsed_command_line.HasSwitch(kStartIndexSwitch)) {
ASSERT_TRUE(
- StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
+ base::StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
kStartIndexSwitch)), &g_start_index));
ASSERT_GT(g_start_index, 0);
}
if (parsed_command_line.HasSwitch(kEndIndexSwitch)) {
ASSERT_TRUE(
- StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
+ base::StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
kEndIndexSwitch)), &g_end_index));
ASSERT_GT(g_end_index, 0);
}
@@ -580,7 +581,7 @@ void SetPageRange(const CommandLine& parsed_command_line) {
if (parsed_command_line.HasSwitch(kIterationSwitch)) {
ASSERT_TRUE(
- StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
+ base::StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
kIterationSwitch)), &g_iterations));
ASSERT_GT(g_iterations, 0);
}
@@ -596,7 +597,7 @@ void SetPageRange(const CommandLine& parsed_command_line) {
if (parsed_command_line.HasSwitch(kTimeoutSwitch)) {
ASSERT_TRUE(
- StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
+ base::StringToInt(WideToUTF16(parsed_command_line.GetSwitchValue(
kTimeoutSwitch)), &g_timeout_ms));
ASSERT_GT(g_timeout_ms, 0);
}