Use FileTypePolicies for is_archive and is_supported classifications.

chrome/common/safe_browsing/download_protection_util_unittest.cc

Index: chrome/common/safe_browsing/download_protection_util_unittest.cc
diff --git a/chrome/common/safe_browsing/download_protection_util_unittest.cc b/chrome/common/safe_browsing/download_protection_util_unittest.cc
index f8511a4ab9787799f362f347a7502798d8fac0f2..8fc2fd77159234e10f9886d98650932937825d92 100644
--- a/chrome/common/safe_browsing/download_protection_util_unittest.cc
+++ b/chrome/common/safe_browsing/download_protection_util_unittest.cc
@@ -11,55 +11,6 @@ namespace safe_browsing {
 namespace download_protection_util {
 
 TEST(DownloadProtectionUtilTest, KnownValues) {
-  EXPECT_EQ(0, GetSBClientDownloadExtensionValueForUMA(
-                   base::FilePath(FILE_PATH_LITERAL("foo.exe"))));
-  EXPECT_EQ(0, GetSBClientDownloadExtensionValueForUMA(
-                   base::FilePath(FILE_PATH_LITERAL("foo.exe."))));
-  EXPECT_EQ(0, GetSBClientDownloadExtensionValueForUMA(
-                   base::FilePath(FILE_PATH_LITERAL("foo.exe "))));
-  EXPECT_EQ(0, GetSBClientDownloadExtensionValueForUMA(
-                   base::FilePath(FILE_PATH_LITERAL("foo.exe.. . . .   "))));
-  EXPECT_EQ(9, GetSBClientDownloadExtensionValueForUMA(
-                   base::FilePath(FILE_PATH_LITERAL("foo.dll"))));
-  EXPECT_EQ(29, GetSBClientDownloadExtensionValueForUMA(
-                    base::FilePath(FILE_PATH_LITERAL("foo.jse"))));
-  EXPECT_EQ(18, GetSBClientDownloadExtensionValueForUMA(
-                    base::FilePath(FILE_PATH_LITERAL("foo.111"))));
-  EXPECT_EQ(18, GetSBClientDownloadExtensionValueForUMA(
-                    base::FilePath(FILE_PATH_LITERAL("foo.zzz"))));
-  EXPECT_EQ(152, GetSBClientDownloadExtensionValueForUMA(
-                    base::FilePath(FILE_PATH_LITERAL("foo.tbz2"))));
-  EXPECT_TRUE(IsArchiveFile(base::FilePath(FILE_PATH_LITERAL("foo.zip"))));
-  EXPECT_TRUE(IsArchiveFile(base::FilePath(FILE_PATH_LITERAL("foo.zip."))));
-  EXPECT_TRUE(IsArchiveFile(base::FilePath(FILE_PATH_LITERAL("foo.zip "))));
-  EXPECT_TRUE(
-      IsArchiveFile(base::FilePath(FILE_PATH_LITERAL("foo.zip   ...."))));
-  EXPECT_TRUE(
-      IsSupportedBinaryFile(base::FilePath(FILE_PATH_LITERAL("foo.zip"))));
-  EXPECT_TRUE(IsArchiveFile(base::FilePath(FILE_PATH_LITERAL("foo.rar"))));
-  EXPECT_TRUE(
-      IsSupportedBinaryFile(base::FilePath(FILE_PATH_LITERAL("foo.rar"))));
-  EXPECT_FALSE(IsArchiveFile(base::FilePath(FILE_PATH_LITERAL("foo.ps1"))));
-  EXPECT_FALSE(
-      IsArchiveFile(base::FilePath(FILE_PATH_LITERAL("foo.unknownextension"))));
-  EXPECT_FALSE(
-      IsArchiveFile(base::FilePath(FILE_PATH_LITERAL("no_extension"))));
-  EXPECT_TRUE(IsSupportedBinaryFile(base::FilePath(FILE_PATH_LITERAL(".exe"))));
-  EXPECT_TRUE(
-      IsSupportedBinaryFile(base::FilePath(FILE_PATH_LITERAL("foo.msi"))));
-  EXPECT_TRUE(
-      IsSupportedBinaryFile(base::FilePath(FILE_PATH_LITERAL("foo.msi."))));
-  EXPECT_TRUE(
-      IsSupportedBinaryFile(base::FilePath(FILE_PATH_LITERAL("foo.msi "))));
-  EXPECT_TRUE(IsSupportedBinaryFile(
-      base::FilePath(FILE_PATH_LITERAL("foo.msi  .. .."))));
-  EXPECT_FALSE(
-      IsSupportedBinaryFile(base::FilePath(FILE_PATH_LITERAL("foo.txt"))));
-  EXPECT_FALSE(IsSupportedBinaryFile(
-      base::FilePath(FILE_PATH_LITERAL("foo.unknownextension"))));
-  EXPECT_FALSE(
-      IsSupportedBinaryFile(base::FilePath(FILE_PATH_LITERAL("no_extension"))));
-
   EXPECT_EQ(ClientDownloadRequest::WIN_EXECUTABLE,
             GetDownloadType(base::FilePath(FILE_PATH_LITERAL("foo.exe"))));
   EXPECT_EQ(ClientDownloadRequest::CHROME_EXTENSION,