Use FileTypePolicies for is_archive and is_supported classifications.

chrome/browser/safe_browsing/unverified_download_field_trial.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/safe_browsing/unverified_download_field_trial.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/safe_browsing/download_protection_util.h"
+#include "chrome/common/safe_browsing/file_type_policies.h"
 #include "components/variations/variations_associated_data.h"
 
 namespace safe_browsing {
 
 const char kUnverifiedDownloadFieldTrialName[] =
     "SafeBrowsingUnverifiedDownloads";
 
 const char kUnverifiedDownloadFieldTrialDisableByParameter[] =
     "DisableByParameter";
 
@@ skipping 37 matching lines @@
 bool IsUnverifiedDownloadAllowedByFieldTrial(const base::FilePath& file) {
   std::string group_name =
       base::FieldTrialList::FindFullName(kUnverifiedDownloadFieldTrialName);
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAllowUncheckedDangerousDownloads))
     return true;
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisallowUncheckedDangerousDownloads) &&
-      download_protection_util::IsSupportedBinaryFile(file))
+      FileTypePolicies::GetInstance()->IsCheckedBinaryFile(file))
     return false;
 
   if (base::StartsWith(group_name,
                        kUnverifiedDownloadFieldTrialDisableByParameter,
                        base::CompareCase::SENSITIVE)) {
     std::map<std::string, std::string> parameters;
     variations::GetVariationParams(kUnverifiedDownloadFieldTrialName,
                                    &parameters);
 
     if (parameters.count(kUnverifiedDownloadFieldTrialBlacklistParam) &&
         MatchesExtensionList(
             file, parameters[kUnverifiedDownloadFieldTrialBlacklistParam]))
       return false;
 
     if (parameters.count(kUnverifiedDownloadFieldTrialWhitelistParam) &&
         MatchesExtensionList(
             file, parameters[kUnverifiedDownloadFieldTrialWhitelistParam]))
       return true;
 
     if (parameters.count(kUnverifiedDownloadFieldTrialBlockSBTypesParam) &&
         !parameters[kUnverifiedDownloadFieldTrialBlockSBTypesParam].empty() &&
-        download_protection_util::IsSupportedBinaryFile(file))
+        FileTypePolicies::GetInstance()->IsCheckedBinaryFile(file))
       return false;
   }
 
   return true;
 }
 
 }  // namespace safe_browsing