Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(453)

Unified Diff: chrome/test/ui/ui_test.cc

Issue 28281: Get rid of wstring variants of StringToFoo. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/ui/ui_test.cc
===================================================================
--- chrome/test/ui/ui_test.cc (revision 10641)
+++ chrome/test/ui/ui_test.cc (working copy)
@@ -186,27 +186,27 @@
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(kUiTestTimeout)) {
std::wstring timeout_str = command_line.GetSwitchValue(kUiTestTimeout);
- int timeout = StringToInt(timeout_str);
+ int timeout = StringToInt(WideToUTF16Hack(timeout_str));
command_execution_timeout_ms_ = std::max(kMaxTestExecutionTime, timeout);
}
if (command_line.HasSwitch(kUiTestActionTimeout)) {
std::wstring act_str = command_line.GetSwitchValue(kUiTestActionTimeout);
- int act_timeout = StringToInt(act_str);
+ int act_timeout = StringToInt(WideToUTF16Hack(act_str));
action_timeout_ms_ = std::max(kWaitForActionMsec, act_timeout);
}
if (command_line.HasSwitch(kUiTestActionMaxTimeout)) {
std::wstring action_max_str =
command_line.GetSwitchValue(kUiTestActionMaxTimeout);
- int max_timeout = StringToInt(action_max_str);
+ int max_timeout = StringToInt(WideToUTF16Hack(action_max_str));
action_max_timeout_ms_ = std::max(kWaitForActionMaxMsec, max_timeout);
}
if (CommandLine::ForCurrentProcess()->HasSwitch(kUiTestSleepTimeout)) {
std::wstring sleep_timeout_str =
CommandLine::ForCurrentProcess()->GetSwitchValue(kUiTestSleepTimeout);
- int sleep_timeout = StringToInt(sleep_timeout_str);
+ int sleep_timeout = StringToInt(WideToUTF16Hack(sleep_timeout_str));
sleep_timeout_ms_ = std::max(kWaitForActionMsec, sleep_timeout);
}
}

Powered by Google App Engine
This is Rietveld 408576698