diff options
| -rw-r--r-- | base/string_util.cc | 8 | ||||
| -rw-r--r-- | base/string_util.h | 3 | ||||
| -rw-r--r-- | webkit/plugins/npapi/plugin_group.cc | 6 |
3 files changed, 3 insertions, 14 deletions
diff --git a/base/string_util.cc b/base/string_util.cc index 4a191b4..9582f4b 100644 --- a/base/string_util.cc +++ b/base/string_util.cc @@ -184,19 +184,11 @@ bool RemoveCharsT(const STR& input, return removed; } -bool RemoveChars(const std::wstring& input, - const wchar_t remove_chars[], - std::wstring* output) { - return RemoveCharsT(input, remove_chars, output); -} - -#if !defined(WCHAR_T_IS_UTF16) bool RemoveChars(const string16& input, const char16 remove_chars[], string16* output) { return RemoveCharsT(input, remove_chars, output); } -#endif bool RemoveChars(const std::string& input, const char remove_chars[], diff --git a/base/string_util.h b/base/string_util.h index 0b52ac0..0cb439c 100644 --- a/base/string_util.h +++ b/base/string_util.h @@ -180,9 +180,6 @@ BASE_API extern const char kUtf8ByteOrderMark[]; // Removes characters in remove_chars from anywhere in input. Returns true if // any characters were removed. // NOTE: Safe to use the same variable for both input and output. -BASE_API bool RemoveChars(const std::wstring& input, - const wchar_t remove_chars[], - std::wstring* output); BASE_API bool RemoveChars(const string16& input, const char16 remove_chars[], string16* output); diff --git a/webkit/plugins/npapi/plugin_group.cc b/webkit/plugins/npapi/plugin_group.cc index 537b204..3c8b73f 100644 --- a/webkit/plugins/npapi/plugin_group.cc +++ b/webkit/plugins/npapi/plugin_group.cc @@ -244,15 +244,15 @@ bool PluginGroup::Match(const WebPluginInfo& plugin) const { Version* PluginGroup::CreateVersionFromString(const string16& version_string) { // Remove spaces and ')' from the version string, // Replace any instances of 'r', ',' or '(' with a dot. - std::wstring version = UTF16ToWide(version_string); - RemoveChars(version, L") ", &version); + std::string version = UTF16ToASCII(version_string); + RemoveChars(version, ") ", &version); std::replace(version.begin(), version.end(), 'd', '.'); std::replace(version.begin(), version.end(), 'r', '.'); std::replace(version.begin(), version.end(), ',', '.'); std::replace(version.begin(), version.end(), '(', '.'); std::replace(version.begin(), version.end(), '_', '.'); - return Version::GetVersionFromString(WideToASCII(version)); + return Version::GetVersionFromString(version); } void PluginGroup::UpdateActivePlugin(const WebPluginInfo& plugin) { |