| Index: net/base/mime_util.cc
|
| diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
|
| index 7dd51a2945d4556a6ce45f858546e9c60ba8af69..da7931c8558d1f67006a9a0a16027419670b7b43 100644
|
| --- a/net/base/mime_util.cc
|
| +++ b/net/base/mime_util.cc
|
| @@ -952,7 +952,7 @@ static bool ParseH264CodecID(const std::string& codec_id,
|
| return false;
|
| }
|
|
|
| - std::string profile = StringToUpperASCII(codec_id.substr(5, 4));
|
| + std::string profile = base::StringToUpperASCII(codec_id.substr(5, 4));
|
| if (profile == "42E0") {
|
| *codec = MimeUtil::H264_BASELINE;
|
| } else if (profile == "4D40") {
|
| @@ -965,7 +965,8 @@ static bool ParseH264CodecID(const std::string& codec_id,
|
| return true;
|
| }
|
|
|
| - *is_ambiguous = !IsValidH264Level(StringToUpperASCII(codec_id.substr(9)));
|
| + *is_ambiguous =
|
| + !IsValidH264Level(base::StringToUpperASCII(codec_id.substr(9)));
|
| return true;
|
| }
|
|
|
|
|