From 74f778ee567a5e18ae6766416711b92fc6e7f39a Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 14 Mar 2014 21:11:46 +0000 Subject: Move UTF16ToASCII, remove WideToASCII. This removes WideToASCII and changes all callers to use UTF16ToASCII instead. Moves UTF16ToASCII from base/strings/string_util.h to base/strings/utf_string_conversions.h and into the base namespace. Convert a few related string_util functions to take a StringPiece16 instead of a string16. Remove IsStringASCII(std::wstring) which was unused. Updates callers' includes and namespace usage accordingly. TBR=sky Review URL: https://codereview.chromium.org/176843022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257200 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/host/setup/me2me_native_messaging_host.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'remoting') diff --git a/remoting/host/setup/me2me_native_messaging_host.cc b/remoting/host/setup/me2me_native_messaging_host.cc index 5d724b0..b7183b0 100644 --- a/remoting/host/setup/me2me_native_messaging_host.cc +++ b/remoting/host/setup/me2me_native_messaging_host.cc @@ -537,7 +537,7 @@ void Me2MeNativeMessagingHost::EnsureElevatedHostCreated() { // Create a security descriptor that gives full access to the caller and // denies access by anyone else. std::string security_descriptor = base::StringPrintf( - "O:%1$sG:%1$sD:(A;;GA;;;%1$s)", WideToASCII(user_sid).c_str()); + "O:%1$sG:%1$sD:(A;;GA;;;%1$s)", base::UTF16ToASCII(user_sid).c_str()); ScopedSd sd = ConvertSddlToSd(security_descriptor); if (!sd) { -- cgit v1.1