diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 21:15:35 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 21:15:35 +0000 |
| commit | a61c5c9bb6524d77c30b6a18f542c0e4616ee7bc (patch) | |
| tree | c1afa473cffdaea857f181ba0788e60212649f30 /net/base/escape.cc | |
| parent | 0eb90137036cf765397a69f04f5c6695679fd8c0 (diff) | |
| download | chromium_src-a61c5c9bb6524d77c30b6a18f542c0e4616ee7bc.zip chromium_src-a61c5c9bb6524d77c30b6a18f542c0e4616ee7bc.tar.gz chromium_src-a61c5c9bb6524d77c30b6a18f542c0e4616ee7bc.tar.bz2 | |
Remove wstring from TemplateURL and friends.
BUG=23581
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6322001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/escape.cc')
| -rw-r--r-- | net/base/escape.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/base/escape.cc b/net/base/escape.cc index 5479b82..ae8411b 100644 --- a/net/base/escape.cc +++ b/net/base/escape.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -192,9 +192,9 @@ std::string EscapeQueryParamValue(const std::string& text, bool use_plus) { // Convert the string to a sequence of bytes and then % escape anything // except alphanumerics and !'()*-._~ -std::wstring EscapeQueryParamValueUTF8(const std::wstring& text, - bool use_plus) { - return UTF8ToWide(Escape(WideToUTF8(text), kQueryCharmap, use_plus)); +string16 EscapeQueryParamValueUTF8(const string16& text, + bool use_plus) { + return UTF8ToUTF16(Escape(UTF16ToUTF8(text), kQueryCharmap, use_plus)); } // non-printable, non-7bit, and (including space) "#%:<>?[\]^`{|} |