chrome/test/automated_ui_tests/automated_ui_tests.cc - Issue 192017: Convert std::wstring encoding names to std::string in a bunch of files.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/automated_ui_tests/automated_ui_tests.cc

Issue 192017: Convert std::wstring encoding names to std::string in a bunch of files. (Closed)

Patch Set: mac and linux fixes Created 11 years, 3 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:

Index: chrome/test/automated_ui_tests/automated_ui_tests.cc

diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc

index facb5d468f628197fc39672119f95942c0f97c1c..396b924e9fcb8e2a520f8977753432a7d8b1ec87 100644

--- a/chrome/test/automated_ui_tests/automated_ui_tests.cc

+++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc

@@ -439,7 +439,7 @@ bool AutomatedUITest::ChangeEncoding() {

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"");

+ cur_locale, "ISO-8859-1,windows-1252", "");

DCHECK(encodings);

DCHECK(!encodings->empty());

unsigned len = static_cast<unsigned>(encodings->size());