| Index: base/i18n/character_encoding.h
|
| diff --git a/base/i18n/character_encoding.h b/base/i18n/character_encoding.h
|
| index 5539ba451d93fa9c47b713157b092a0e401e0564..974cb5a6f9248a54c68d9dbfaf514064ec167cb3 100644
|
| --- a/base/i18n/character_encoding.h
|
| +++ b/base/i18n/character_encoding.h
|
| @@ -12,7 +12,7 @@
|
| namespace base {
|
|
|
| // Return canonical encoding name according to the encoding alias name.
|
| -BASE_I18N_EXPORT const char* GetCanonicalEncodingNameByAliasName(
|
| +BASE_I18N_EXPORT std::string GetCanonicalEncodingNameByAliasName(
|
| const std::string& alias_name);
|
|
|
| } // namespace base
|
|
|