Use FileTypePolicies for is_archive and is_supported classifications.

chrome/browser/safe_browsing/unverified_download_policy.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_policy.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/metrics/sparse_histogram.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/safe_browsing/unverified_download_field_trial.h"
-#include "chrome/common/safe_browsing/download_protection_util.h"
+#include "chrome/common/safe_browsing/file_type_policies.h"
 #include "components/rappor/rappor_service.h"
 #include "components/rappor/rappor_utils.h"
 #include "components/safe_browsing_db/database_manager.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace safe_browsing {
 
 namespace {
 using content::BrowserThread;
 
@@ skipping 18 matching lines @@
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(&RecordPolicyMetricOnUIThread, metric_name,
                                      uma_file_type, requestor));
 }
 
 void RespondWithPolicy(
     const base::FilePath& file,
     const UnverifiedDownloadCheckCompletionCallback& callback,
     const GURL& requestor,
     UnverifiedDownloadPolicy policy) {
-  int uma_file_type =
-      download_protection_util::GetSBClientDownloadExtensionValueForUMA(file);
+  int64_t uma_file_type =
+      FileTypePolicies::GetInstance()->UmaValueForFile(file);
   if (policy == UnverifiedDownloadPolicy::ALLOWED) {
     RecordPolicyMetric("SafeBrowsing.UnverifiedDownloads.Allowed",
                        uma_file_type, requestor);
   } else {
     RecordPolicyMetric("SafeBrowsing.UnverifiedDownloads.Blocked",
                        uma_file_type, requestor);
   }
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(callback, policy));
 }
@@ skipping 22 matching lines @@
                     UnverifiedDownloadPolicy::ALLOWED);
 }
 
 void CheckWhitelistOnIOThread(
     scoped_refptr<SafeBrowsingService> service,
     const GURL& requestor,
     const base::FilePath& file,
     const std::vector<base::FilePath::StringType>& alternate_extensions,
     const UnverifiedDownloadCheckCompletionCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  int uma_file_type =
-      download_protection_util::GetSBClientDownloadExtensionValueForUMA(file);
+  int64_t uma_file_type =
+      FileTypePolicies::GetInstance()->UmaValueForFile(file);
 
   if (!service || !service->enabled()) {
     // If the SafeBrowsing service was disabled, don't try to check against the
     // field trial list. Instead allow the download. We are assuming that if the
     // SafeBrowsing service was disabled for this user, then we shouldn't
     // interefere with unverified downloads.
     RecordPolicyMetric(
         "SafeBrowsing.UnverifiedDownloads.AllowedDueToDisabledService",
         uma_file_type, requestor);
     RespondWithPolicy(file, callback, requestor,
@@ skipping 35 matching lines @@
         BrowserThread::IO, FROM_HERE,
         base::Bind(&CheckWhitelistOnIOThread, service, requestor, file,
                    alternate_extensions, callback));
     return;
   }
 
   CheckFieldTrialOnAnyThread(file, alternate_extensions, GURL(), callback);
 }
 
 }  // namespace safe_browsing