Use FileTypePolicies for is_archive and is_supported classifications.

chrome/common/safe_browsing/zip_analyzer.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/common/safe_browsing/zip_analyzer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 
 #include "base/i18n/streaming_utf8_validator.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "chrome/common/safe_browsing/binary_feature_extractor.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 "chrome/common/safe_browsing/zip_analyzer_results.h"
 #include "crypto/secure_hash.h"
 #include "crypto/sha2.h"
 #include "third_party/zlib/google/zip_reader.h"
 
 namespace safe_browsing {
 namespace zip_analyzer {
 
 namespace {
 
@@ skipping 60 matching lines @@
       archived_binary->clear_signature();
     }
   }
 }
 
 }  // namespace
 
 void AnalyzeZipFile(base::File zip_file,
                     base::File temp_file,
                     Results* results) {
+  // Read the the file type policies from disk, since we won't have access
+  // to those read by SafeBrowsingService if we're running in a utility process.
+  safe_browsing::FileTypePoliciesManager file_type_policies_manager;
+
   std::set<base::FilePath> archived_archive_filenames;
   scoped_refptr<BinaryFeatureExtractor> binary_feature_extractor(
       new BinaryFeatureExtractor());
   zip::ZipReader reader;
   if (!reader.OpenFromPlatformFile(zip_file.GetPlatformFile())) {
     DVLOG(1) << "Failed to open zip file";
     return;
   }
 
   bool advanced = true;
   for (; reader.HasMore(); advanced = reader.AdvanceToNextEntry()) {
     if (!advanced) {
       DVLOG(1) << "Could not advance to next entry, aborting zip scan.";
       return;
     }
     if (!reader.OpenCurrentEntryInZip()) {
       DVLOG(1) << "Failed to open current entry in zip file";
       continue;
     }
     const base::FilePath& file = reader.current_entry_info()->file_path();
-    if (download_protection_util::IsArchiveFile(file)) {
+    if (FileTypePolicies::GlobalInstance()->IsArchiveFile(file)) {
       DVLOG(2) << "Downloaded a zipped archive: " << file.value();
       results->has_archive = true;
       archived_archive_filenames.insert(file.BaseName());
-    } else if (download_protection_util::IsSupportedBinaryFile(file)) {
+    } else if (FileTypePolicies::GlobalInstance()->IsCheckedBinaryFile(file)) {
       DVLOG(2) << "Downloaded a zipped executable: " << file.value();
       results->has_executable = true;
       AnalyzeContainedFile(binary_feature_extractor, file, &reader, &temp_file,
                            results->archived_binary.Add());
     } else {
       DVLOG(3) << "Ignoring non-binary file: " << file.value();
     }
   }
   results->archived_archive_filenames.assign(archived_archive_filenames.begin(),
                                              archived_archive_filenames.end());
   results->success = true;
 }
 
 }  // namespace zip_analyzer
 }  // namespace safe_browsing