diff options
| -rw-r--r-- | ppapi/proxy/pdf_resource_unittest.cc | 4 | ||||
| -rw-r--r-- | ppapi/shared_impl/private/ppb_char_set_shared.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/proxy/pdf_resource_unittest.cc b/ppapi/proxy/pdf_resource_unittest.cc index 3ac60d6..d0a2ed3 100644 --- a/ppapi/proxy/pdf_resource_unittest.cc +++ b/ppapi/proxy/pdf_resource_unittest.cc @@ -65,8 +65,8 @@ TEST_F(PDFResourceTest, SearchString) { new PDFResource(Connection(&sink(), &sink()), pp_instance())); pdf_resource->SetLocaleForTest("en-US"); - string16 input; - string16 term; + base::string16 input; + base::string16 term; UTF8ToUTF16("abcdefabcdef", 12, &input); UTF8ToUTF16("bc", 2, &term); 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; |