summaryrefslogtreecommitdiffstats
path: root/chrome/browser/drive/drive_api_util.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 23:18:05 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-24 23:18:05 +0000
commit04338722eaee6d09b761353fb6e937b41933ff5e (patch)
treef15c65f4c1345126fdb05a5855aeb98dbef57bbb /chrome/browser/drive/drive_api_util.cc
parentcc2a2a22ebb171ff4c1eb528b3f8d7e551512732 (diff)
downloadchromium_src-04338722eaee6d09b761353fb6e937b41933ff5e.zip
chromium_src-04338722eaee6d09b761353fb6e937b41933ff5e.tar.gz
chromium_src-04338722eaee6d09b761353fb6e937b41933ff5e.tar.bz2
Revert 242454 "Revert 242450 "Update some uses of UTF conversion..."
> Revert 242450 "Update some uses of UTF conversions in chrome/bro..." > > > Update some uses of UTF conversions in chrome/browser to use the base:: namespace. > > > > BUG=330556 > > TEST=no change > > TBR=ben@chromium.org > > > > Review URL: https://codereview.chromium.org/120953002 > > TBR=avi@chromium.org > > Review URL: https://codereview.chromium.org/107423005 TBR=avi@chromium.org Review URL: https://codereview.chromium.org/121003002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/drive/drive_api_util.cc')
-rw-r--r--chrome/browser/drive/drive_api_util.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/drive/drive_api_util.cc b/chrome/browser/drive/drive_api_util.cc
index dd3b182..1034589 100644
--- a/chrome/browser/drive/drive_api_util.cc
+++ b/chrome/browser/drive/drive_api_util.cc
@@ -160,7 +160,7 @@ std::string EscapeQueryStringValue(const std::string& str) {
std::string TranslateQuery(const std::string& original_query) {
// In order to handle non-ascii white spaces correctly, convert to UTF16.
- base::string16 query = UTF8ToUTF16(original_query);
+ base::string16 query = base::UTF8ToUTF16(original_query);
const base::string16 kDelimiter(
base::kWhitespaceUTF16 + base::string16(1, static_cast<char16>('"')));
@@ -218,7 +218,7 @@ std::string TranslateQuery(const std::string& original_query) {
&result,
"%sfullText contains \'%s\'",
is_exclusion ? "not " : "",
- EscapeQueryStringValue(UTF16ToUTF8(token)).c_str());
+ EscapeQueryStringValue(base::UTF16ToUTF8(token)).c_str());
}
return result;