diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 16:40:10 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 16:40:10 +0000 |
| commit | a9bb6f69b32018c245e05a79011114653fe8f5e0 (patch) | |
| tree | c4fe6b5db0e508f860c82feb44245bf549d608ff /net/base/mime_util_unittest.cc | |
| parent | f23423a1245dffc2a368708fafd2867d2cf3e0f8 (diff) | |
| download | chromium_src-a9bb6f69b32018c245e05a79011114653fe8f5e0.zip chromium_src-a9bb6f69b32018c245e05a79011114653fe8f5e0.tar.gz chromium_src-a9bb6f69b32018c245e05a79011114653fe8f5e0.tar.bz2 | |
Move some more classes from net/base into the net:: namespace.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/mime_util_unittest.cc')
| -rw-r--r-- | net/base/mime_util_unittest.cc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/net/base/mime_util_unittest.cc b/net/base/mime_util_unittest.cc index 3031d1b..468e2c7 100644 --- a/net/base/mime_util_unittest.cc +++ b/net/base/mime_util_unittest.cc @@ -53,7 +53,7 @@ TEST(MimeUtilTest, ExtensionTest) { bool rv; for (size_t i = 0; i < arraysize(tests); ++i) { - rv = mime_util::GetMimeTypeFromExtension(tests[i].extension, &mime_type); + rv = net::GetMimeTypeFromExtension(tests[i].extension, &mime_type); EXPECT_EQ(rv, tests[i].valid); if (rv) EXPECT_EQ(mime_type, tests[i].mime_type); @@ -75,7 +75,7 @@ TEST(MimeUtilTest, FileTest) { bool rv; for (size_t i = 0; i < arraysize(tests); ++i) { - rv = mime_util::GetMimeTypeFromFile(tests[i].file_path, &mime_type); + rv = net::GetMimeTypeFromFile(tests[i].file_path, &mime_type); EXPECT_EQ(rv, tests[i].valid); if (rv) EXPECT_EQ(mime_type, tests[i].mime_type); @@ -83,32 +83,32 @@ TEST(MimeUtilTest, FileTest) { } TEST(MimeUtilTest, LookupTypes) { - EXPECT_EQ(true, mime_util::IsSupportedImageMimeType("image/jpeg")); - EXPECT_EQ(false, mime_util::IsSupportedImageMimeType("image/lolcat")); - EXPECT_EQ(true, mime_util::IsSupportedNonImageMimeType("text/html")); - EXPECT_EQ(false, mime_util::IsSupportedNonImageMimeType("text/virus")); + EXPECT_EQ(true, net::IsSupportedImageMimeType("image/jpeg")); + EXPECT_EQ(false, net::IsSupportedImageMimeType("image/lolcat")); + EXPECT_EQ(true, net::IsSupportedNonImageMimeType("text/html")); + EXPECT_EQ(false, net::IsSupportedNonImageMimeType("text/virus")); } TEST(MimeUtilTest, MatchesMimeType) { - EXPECT_EQ(true, mime_util::MatchesMimeType("*", "video/x-mpeg")); - EXPECT_EQ(true, mime_util::MatchesMimeType("video/*", "video/x-mpeg")); - EXPECT_EQ(true, mime_util::MatchesMimeType("video/x-mpeg", "video/x-mpeg")); - EXPECT_EQ(true, mime_util::MatchesMimeType("application/*+xml", + EXPECT_EQ(true, net::MatchesMimeType("*", "video/x-mpeg")); + EXPECT_EQ(true, net::MatchesMimeType("video/*", "video/x-mpeg")); + EXPECT_EQ(true, net::MatchesMimeType("video/x-mpeg", "video/x-mpeg")); + EXPECT_EQ(true, net::MatchesMimeType("application/*+xml", "application/html+xml")); - EXPECT_EQ(true, mime_util::MatchesMimeType("application/*+xml", + EXPECT_EQ(true, net::MatchesMimeType("application/*+xml", "application/+xml")); - EXPECT_EQ(true, mime_util::MatchesMimeType("aaa*aaa", + EXPECT_EQ(true, net::MatchesMimeType("aaa*aaa", "aaaaaa")); - EXPECT_EQ(false, mime_util::MatchesMimeType("video/", "video/x-mpeg")); - EXPECT_EQ(false, mime_util::MatchesMimeType("", "video/x-mpeg")); - EXPECT_EQ(false, mime_util::MatchesMimeType("", "")); - EXPECT_EQ(false, mime_util::MatchesMimeType("video/x-mpeg", "")); - EXPECT_EQ(false, mime_util::MatchesMimeType("application/*+xml", + EXPECT_EQ(false, net::MatchesMimeType("video/", "video/x-mpeg")); + EXPECT_EQ(false, net::MatchesMimeType("", "video/x-mpeg")); + EXPECT_EQ(false, net::MatchesMimeType("", "")); + EXPECT_EQ(false, net::MatchesMimeType("video/x-mpeg", "")); + EXPECT_EQ(false, net::MatchesMimeType("application/*+xml", "application/xml")); - EXPECT_EQ(false, mime_util::MatchesMimeType("application/*+xml", + EXPECT_EQ(false, net::MatchesMimeType("application/*+xml", "application/html+xmlz")); - EXPECT_EQ(false, mime_util::MatchesMimeType("application/*+xml", + EXPECT_EQ(false, net::MatchesMimeType("application/*+xml", "applcation/html+xml")); - EXPECT_EQ(false, mime_util::MatchesMimeType("aaa*aaa", + EXPECT_EQ(false, net::MatchesMimeType("aaa*aaa", "aaaaa")); } |