| Index: media/base/mime_util.cc
|
| diff --git a/media/base/mime_util.cc b/media/base/mime_util.cc
|
| index bc12773ca7bd1b16d041ce0c29d67b5f0283cec0..030a4ee1a646a08926a5b6e1adb4c5dd00418301 100644
|
| --- a/media/base/mime_util.cc
|
| +++ b/media/base/mime_util.cc
|
| @@ -544,7 +544,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 (IsValidH264BaselineProfile(profile)) {
|
| *codec = MimeUtil::H264_BASELINE;
|
| } else if (profile == "4D40") {
|
| @@ -557,7 +557,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;
|
| }
|
|
|
|
|