From d00fad03e436f877df1e9a8672df0946ef0b3dc5 Mon Sep 17 00:00:00 2001
From: "dbeam@chromium.org"
<dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 19 Dec 2013 23:42:57 +0000
Subject: Add base:: to string16 in ppapi/.
R=brettw@chromium.org
BUG=329295
Review URL: https://codereview.chromium.org/118563003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241978 0039d316-1c4b-4281-b951-d872f2087c98
---
ppapi/shared_impl/private/ppb_char_set_shared.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'ppapi/shared_impl/private')
diff --git a/ppapi/shared_impl/private/ppb_char_set_shared.cc b/ppapi/shared_impl/private/ppb_char_set_shared.cc
index 2fda8aa..c45c1ba 100644
--- a/ppapi/shared_impl/private/ppb_char_set_shared.cc
+++ b/ppapi/shared_impl/private/ppb_char_set_shared.cc
@@ -220,7 +220,7 @@ PP_Bool PPB_CharSet_Shared::CharSetToUTF16(
// We can convert this call to the implementation in base to avoid code
// duplication, although this does introduce an extra copy of the data.
- string16 output;
+ base::string16 output;
if (!base::CodepageToUTF16(std::string(input, input_len), input_char_set,
base_on_error, &output)) {
*output_utf16_length = 0;
--
cgit v1.1