summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/ui_test_suite.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 21:15:34 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-04 21:15:34 +0000
commitdee7c0509d0e98d1210725aad2ce6e5153780592 (patch)
tree2408eb938674cde03bffb69350171980222d1584 /chrome/test/ui/ui_test_suite.cc
parentf756abf74be7ce47d482f9760eacb608c9f0e121 (diff)
downloadchromium_src-dee7c0509d0e98d1210725aad2ce6e5153780592.zip
chromium_src-dee7c0509d0e98d1210725aad2ce6e5153780592.tar.gz
chromium_src-dee7c0509d0e98d1210725aad2ce6e5153780592.tar.bz2
Remove GetSwitchValue() from chrome/* where easy.
Review URL: http://codereview.chromium.org/3057033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test_suite.cc')
-rw-r--r--chrome/test/ui/ui_test_suite.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/test/ui/ui_test_suite.cc b/chrome/test/ui/ui_test_suite.cc
index 5ba7f1f..3d6d068 100644
--- a/chrome/test/ui/ui_test_suite.cc
+++ b/chrome/test/ui/ui_test_suite.cc
@@ -49,26 +49,26 @@ void UITestSuite::Initialize() {
parsed_command_line.HasSwitch(switches::kSilentDumpOnDCHECK));
UITest::set_disable_breakpad(
parsed_command_line.HasSwitch(switches::kDisableBreakpad));
- std::wstring test_timeout =
- parsed_command_line.GetSwitchValue(UITestSuite::kTestTimeout);
+ std::string test_timeout =
+ parsed_command_line.GetSwitchValueASCII(UITestSuite::kTestTimeout);
if (!test_timeout.empty()) {
int timeout;
- base::StringToInt(WideToUTF8(test_timeout), &timeout);
+ base::StringToInt(test_timeout, &timeout);
UITest::set_test_timeout_ms(timeout);
}
#if defined(OS_WIN)
int batch_count = 0;
int batch_index = 0;
- std::wstring batch_count_str =
- parsed_command_line.GetSwitchValue(UITestSuite::kBatchCount);
+ std::string batch_count_str =
+ parsed_command_line.GetSwitchValueASCII(UITestSuite::kBatchCount);
if (!batch_count_str.empty()) {
- base::StringToInt(WideToUTF16Hack(batch_count_str), &batch_count);
+ base::StringToInt(batch_count_str, &batch_count);
}
- std::wstring batch_index_str =
- parsed_command_line.GetSwitchValue(UITestSuite::kBatchIndex);
+ std::string batch_index_str =
+ parsed_command_line.GetSwitchValueASCII(UITestSuite::kBatchIndex);
if (!batch_index_str.empty()) {
- base::StringToInt(WideToUTF16Hack(batch_index_str), &batch_index);
+ base::StringToInt(batch_index_str, &batch_index);
}
if (batch_count > 0 && batch_index >= 0 && batch_index < batch_count) {
// Running UI test in parallel. Gtest supports running tests in shards,