Use FileTypePolicies for is_archive and is_supported classifications.

chrome/browser/download/download_danger_prompt.cc

 // Copyright (c) 2012 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/download/download_danger_prompt.h"
 
 #include "base/macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
-#include "chrome/common/safe_browsing/download_protection_util.h"
+#include "chrome/common/safe_browsing/file_type_policies.h"
 #include "content/public/browser/download_danger_type.h"
 #include "content/public/browser/download_item.h"
 
 using safe_browsing::ClientDownloadResponse;
 using safe_browsing::ClientSafeBrowsingReportRequest;
-using safe_browsing::download_protection_util::
-    GetSBClientDownloadExtensionValueForUMA;
 
 namespace {
 
 const char kDownloadDangerPromptPrefix[] = "Download.DownloadDangerPrompt";
 
 // Converts DownloadDangerType into their corresponding string.
 const char* GetDangerTypeString(
     const content::DownloadDangerType& danger_type) {
   switch (danger_type) {
     case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE:
@@ skipping 50 matching lines @@
   std::string serialized_report;
   if (report.SerializeToString(&serialized_report))
     sb_service->SendSerializedDownloadReport(serialized_report);
   else
     DLOG(ERROR) << "Unable to serialize the threat report.";
 }
 
 void DownloadDangerPrompt::RecordDownloadDangerPrompt(
     bool did_proceed,
     const content::DownloadItem& download) {
-  int dangerous_file_type =
-      GetSBClientDownloadExtensionValueForUMA(download.GetTargetFilePath());
+  int64_t file_type_uma_value =
+      safe_browsing::FileTypePolicies::GetInstance()->UmaValueForFile(
+          download.GetTargetFilePath());
   content::DownloadDangerType danger_type = download.GetDangerType();
 
   UMA_HISTOGRAM_SPARSE_SLOWLY(
       base::StringPrintf("%s.%s.Shown", kDownloadDangerPromptPrefix,
                          GetDangerTypeString(danger_type)),
-      dangerous_file_type);
+      file_type_uma_value);
   if (did_proceed) {
     UMA_HISTOGRAM_SPARSE_SLOWLY(
         base::StringPrintf("%s.%s.Proceed", kDownloadDangerPromptPrefix,
                            GetDangerTypeString(danger_type)),
-        dangerous_file_type);
+        file_type_uma_value);
   }
 }