| Index: chrome/test/automated_ui_tests/automated_ui_tests.cc
|
| ===================================================================
|
| --- chrome/test/automated_ui_tests/automated_ui_tests.cc (revision 19124)
|
| +++ chrome/test/automated_ui_tests/automated_ui_tests.cc (working copy)
|
| @@ -397,7 +397,7 @@
|
|
|
| bool AutomatedUITest::ChangeEncoding() {
|
| // Get the encoding list that is used to populate the UI (encoding menu)
|
| - std::wstring cur_locale = g_browser_process->GetApplicationLocale();
|
| + std::string cur_locale = g_browser_process->GetApplicationLocale();
|
| const std::vector<CharacterEncoding::EncodingInfo>* encodings =
|
| CharacterEncoding::GetCurrentDisplayEncodings(
|
| cur_locale, L"ISO-8859-1,windows-1252", L"");
|
|
|