diff options
author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 00:53:01 +0000 |
---|---|---|
committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 00:53:01 +0000 |
commit | 074248931d91c43c612ee611342a5c354f580b2e (patch) | |
tree | 654b9a2a73672ae31daba1161fa969c8646bd11a /net/base/mime_util_unittest.cc | |
parent | 57675d4d32433b20aa1852690c69ddbf18693f1f (diff) | |
download | chromium_src-074248931d91c43c612ee611342a5c354f580b2e.zip chromium_src-074248931d91c43c612ee611342a5c354f580b2e.tar.gz chromium_src-074248931d91c43c612ee611342a5c354f580b2e.tar.bz2 |
Chromium side changes for enabling VP8 and WebM support.
Patches by Frank Galligan (fgalligan@google.com), Tom Finegan (tomfinegan@google.com) and James Zern (jzern@google.com).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2093007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/mime_util_unittest.cc')
-rw-r--r-- | net/base/mime_util_unittest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc index 0300da8..51b7f3a 100644 --- a/net/base/mime_util_unittest.cc +++ b/net/base/mime_util_unittest.cc @@ -118,10 +118,17 @@ TEST(MimeUtilTest, ParseCodecString) { for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) { std::vector<std::string> codecs_out; - net::ParseCodecString(tests[i].original, &codecs_out); + net::ParseCodecString(tests[i].original, &codecs_out, true); EXPECT_EQ(tests[i].expected_size, codecs_out.size()); for (size_t j = 0; j < tests[i].expected_size; ++j) { EXPECT_EQ(tests[i].results[j], codecs_out[j]); } } + + // Test without stripping the codec type. + std::vector<std::string> codecs_out; + net::ParseCodecString("avc1.42E01E, mp4a.40.2", &codecs_out, false); + EXPECT_EQ(2u, codecs_out.size()); + EXPECT_STREQ("avc1.42E01E", codecs_out[0].c_str()); + EXPECT_STREQ("mp4a.40.2", codecs_out[1].c_str()); } |