Use FileTypePolicies for is_archive and is_supported classifications.

chrome/browser/safe_browsing/unverified_download_field_trial_unittest.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 "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"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace safe_browsing {
 
 namespace {
 
 const base::FilePath::CharType kSafeFilename[] = FILE_PATH_LITERAL("foo.txt");
 const base::FilePath::CharType kHandledFilename[] =
@@ skipping 27 matching lines @@
 
  private:
   base::FieldTrialList field_trial_list_;
 };
 
 }  // namespace
 
 // Verify some test assumptions. Namely, that kSafeFilename is not a supported
 // binary file and that kHandledFilename is.
 TEST(UnverifiedDownloadFieldTrialTest, Assumptions) {
-  EXPECT_TRUE(download_protection_util::IsSupportedBinaryFile(
-      base::FilePath(kHandledFilename)));
-  EXPECT_FALSE(download_protection_util::IsSupportedBinaryFile(
-      base::FilePath(kSafeFilename)));
+  FileTypePolicies* policies = FileTypePolicies::GetInstance();
+  EXPECT_TRUE(policies->IsCheckedBinaryFile(base::FilePath(kHandledFilename)));
+  EXPECT_FALSE(policies->IsCheckedBinaryFile(base::FilePath(kSafeFilename)));
 }
 
 // Verify that disallow-unchecked-dangerous-downloads command line switch causes
 // all dangerous file types to be blocked, and that safe files types are still
 // allowed.
 TEST(UnverifiedDownloadFieldTrialTest, CommandLine_DisallowDangerous) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kDisallowUncheckedDangerousDownloads);
   EXPECT_TRUE(IsUnverifiedDownloadAllowedByFieldTrial(
       base::FilePath(kSafeFilename)));
@@ skipping 213 matching lines @@
 
   EXPECT_TRUE(IsUnverifiedDownloadAllowedByFieldTrial(
       base::FilePath(kSafeFilename)));
   EXPECT_FALSE(IsUnverifiedDownloadAllowedByFieldTrial(
       base::FilePath(kHandledFilename)));
   EXPECT_FALSE(IsUnverifiedDownloadAllowedByFieldTrial(
       base::FilePath(FILE_PATH_LITERAL("foo.abc"))));
 }
 
 }  // namespace safe_browsing