webkit/tools/test_shell/test_shell.cc - Issue 6246036: FilePath: Remove most of ToWStringHack, adding a LossyDisplayName()

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: webkit/tools/test_shell/test_shell.cc

Issue 6246036: FilePath: Remove most of ToWStringHack, adding a LossyDisplayName() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 11 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: webkit/tools/test_shell/test_shell.cc

diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc

index a08f4ad4a12ee3a31ecb5b73b0632e47a211877e..d08d2e7cd2890ece287eb65a3f2a4026e589ffcf 100644

--- a/webkit/tools/test_shell/test_shell.cc

+++ b/webkit/tools/test_shell/test_shell.cc

@@ -816,8 +816,9 @@ bool IsDefaultPluginEnabled() {

FilePath exe_path;

if (PathService::Get(base::FILE_EXE, &exe_path)) {

- std::wstring exe_name = exe_path.BaseName().ToWStringHack();

- if (StartsWith(exe_name, L"test_shell_tests", false))

+ std::string exe_name =

+ UTF16ToASCII(exe_path.BaseName().LossyDisplayName()));

+ if (StartsWith(exe_name, "test_shell_tests", false))

return true;

}

return false;