Use FileTypePolicies for is_archive and is_supported classifications.

chrome/browser/safe_browsing/incident_reporting/last_download_finder.cc

 // Copyright 2014 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/incident_reporting/last_download_finder.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h"
 #include "chrome/common/pref_names.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 "components/history/core/browser/download_constants.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "crypto/sha2.h"
 
 namespace safe_browsing {
 
@@ skipping 46 matching lines @@
   // The default return value of download_protection_util::GetDownloadType is
   // ClientDownloadRequest::WIN_EXECUTABLE.
   return download_type == ClientDownloadRequest::WIN_EXECUTABLE;
 }
 
 // Returns true if a download represented by a DownloadRow is a binary file for
 // the current OS.
 bool IsBinaryDownload(const history::DownloadRow& row) {
   // TODO(grt): Peek into archives to see if they contain binaries;
   // http://crbug.com/386915.
-  return (download_protection_util::IsSupportedBinaryFile(row.target_path) &&
-          !download_protection_util::IsArchiveFile(row.target_path) &&
+  FileTypePolicies* policies = FileTypePolicies::GetInstance();
+  return (policies->IsCheckedBinaryFile(row.target_path) &&
+          !policies->IsArchiveFile(row.target_path) &&
           IsBinaryDownloadForCurrentOS(
               download_protection_util::GetDownloadType(row.target_path)));
 }
 
 // Returns true if a download represented by a DownloadRow is not a binary file.
 bool IsNonBinaryDownload(const history::DownloadRow& row) {
-  return !download_protection_util::IsSupportedBinaryFile(row.target_path);
+  return !FileTypePolicies::GetInstance()->IsCheckedBinaryFile(
+      row.target_path);
 }
 
 // Returns true if a download represented by a DownloadDetails is binary file
 // for the current OS.
 bool IsBinaryDownload(const ClientIncidentReport_DownloadDetails& details) {
   // DownloadDetails are only generated for binary downloads.
   return IsBinaryDownloadForCurrentOS(details.download().download_type());
 }
 
 // Returns true if a download represented by a DownloadRow has been opened.
@@ skipping 93 matching lines @@
   if (download.opened)
     details->set_open_time_msec(download.end_time.ToJavaTime());
 }
 
 // Populates the |details| protobuf with information pertaining to the
 // (non-binary) |download|.
 void PopulateNonBinaryDetailsFromRow(
     const history::DownloadRow& download,
     ClientIncidentReport_NonBinaryDownloadDetails* details) {
   details->set_file_type(
-      base::FilePath(
-          download_protection_util::GetFileExtension(download.target_path))
+      base::FilePath(FileTypePolicies::GetFileExtension(download.target_path))
           .AsUTF8Unsafe());
   details->set_length(download.received_bytes);
   if (download.url_chain.back().has_host())
     details->set_host(download.url_chain.back().host());
   details->set_url_spec_sha256(
       crypto::SHA256HashString(download.url_chain.back().spec()));
 }
 
 }  // namespace
 
@@ skipping 211 matching lines @@
     }
   }
 }
 
 void LastDownloadFinder::HistoryServiceBeingDeleted(
     history::HistoryService* history_service) {
   history_service_observer_.Remove(history_service);
 }
 
 }  // namespace safe_browsing