Revert "Reuse upload browsertests for corresponding Enterprise Connectors"

This reverts commit 8a905049.

Reason for revert: consistent failure on CrOS
https://ci.chromium.org/p/chromium/builders/ci/linux-chromeos-rel/38104?blamelist=1#blamelist-tab

Original change's description:
> Reuse upload browsertests for corresponding Enterprise Connectors
> 
> This reuses tests by having the policy setters of
> DeepScanningBrowserTestBase set either legacy or Connector policies, and
> then making every upload browsertest parametrized with a bool so both
> policy sets get tested.
> 
> The DeepScanningDialogViews test also change a bit, the ScanType test
> parameter is removed since this dialog doesn't depend on the type of
> scanning being done. This avoids having a very large number of
> combinations for that test that don't cover different code paths.
> 
> Bug: 1076083
> Change-Id: I419b21de0095add8b5b214993be010d022941202
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2210782
> Reviewed-by: Roger Tawa <rogerta@chromium.org>
> Commit-Queue: Dominique Fauteux-Chapleau <domfc@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#770745}

TBR=rogerta@chromium.org,domfc@chromium.org

Change-Id: Ifbd58dd8403a58b48b2d4911387b2ecbbd5bf70a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1076083
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2209222Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770969}

chrome/browser/enterprise/connectors/analysis_service_settings.cc

@@ -27,7 +27,7 @@ AnalysisServiceSettings::AnalysisServiceSettings(
   matcher_ = std::make_unique<url_matcher::URLMatcher>();
   url_matcher::URLMatcherConditionSet::ID id(0);
   const base::Value* enable = settings_value.FindListKey(kKeyEnable);
-  if (enable && enable->is_list() && !enable->GetList().empty()) {
+  if (enable && enable->is_list()) {
     for (const base::Value& value : enable->GetList())
       AddUrlPatternSettings(value, true, &id);
   } else {

chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_browsertest_base.cc

@@ -5,16 +5,13 @@
 #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_browsertest_base.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/enterprise/connectors/connectors_manager.h"
 #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_dialog_views.h"
-#include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_test_utils.h"
 #include "chrome/browser/safe_browsing/cloud_content_scanning/fake_deep_scanning_dialog_delegate.h"
 #include "chrome/browser/safe_browsing/dm_token_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
-#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
 #include "components/safe_browsing/core/features.h"
 
 namespace safe_browsing {
@@ -66,17 +63,10 @@ class UnresponsiveDeepScanningDialogDelegate
 
 }  // namespace
 
-DeepScanningBrowserTestBase::DeepScanningBrowserTestBase(
-    bool use_legacy_policies)
-    : use_legacy_policies_(use_legacy_policies) {
+DeepScanningBrowserTestBase::DeepScanningBrowserTestBase() {
   // Enable every deep scanning features.
-  if (use_legacy_policies_) {
-    scoped_feature_list_.InitWithFeatures(
-        {kContentComplianceEnabled, kMalwareScanEnabled}, {});
-  } else {
-    scoped_feature_list_.InitWithFeatures(
-        {enterprise_connectors::kEnterpriseConnectorsEnabled}, {});
-  }
+  scoped_feature_list_.InitWithFeatures(
+      {kContentComplianceEnabled, kMalwareScanEnabled}, {});
 
   // Change the time values of the upload UI to smaller ones to make tests
   // showing it run faster.
@@ -88,12 +78,7 @@ DeepScanningBrowserTestBase::DeepScanningBrowserTestBase(
 
 DeepScanningBrowserTestBase::~DeepScanningBrowserTestBase() = default;
 
-void DeepScanningBrowserTestBase::SetUpOnMainThread() {
-  enterprise_connectors::ConnectorsManager::GetInstance()->SetUpForTesting();
-}
-
 void DeepScanningBrowserTestBase::TearDownOnMainThread() {
-  enterprise_connectors::ConnectorsManager::GetInstance()->TearDownForTesting();
   DeepScanningDialogDelegate::ResetFactoryForTesting();
 
   SetDlpPolicy(CheckContentComplianceValues::CHECK_NONE);
@@ -105,68 +90,42 @@ void DeepScanningBrowserTestBase::TearDownOnMainThread() {
       BlockUnsupportedFiletypesValues::BLOCK_UNSUPPORTED_FILETYPES_NONE);
   SetBlockLargeFileTransferPolicy(BlockLargeFileTransferValues::BLOCK_NONE);
   SetUnsafeEventsReportingPolicy(false);
-  ClearUrlsToCheckComplianceOfDownloads();
-  ClearUrlsToCheckForMalwareOfUploads();
 }
 
 void DeepScanningBrowserTestBase::SetDlpPolicy(
     CheckContentComplianceValues state) {
-  if (use_legacy_policies_) {
-    g_browser_process->local_state()->SetInteger(prefs::kCheckContentCompliance,
-                                                 state);
-  } else {
-    SetDlpPolicyForConnectors(state);
-  }
+  g_browser_process->local_state()->SetInteger(prefs::kCheckContentCompliance,
+                                               state);
 }
 
 void DeepScanningBrowserTestBase::SetMalwarePolicy(
     SendFilesForMalwareCheckValues state) {
-  if (use_legacy_policies_) {
-    browser()->profile()->GetPrefs()->SetInteger(
-        prefs::kSafeBrowsingSendFilesForMalwareCheck, state);
-  } else {
-    SetMalwarePolicyForConnectors(state);
-  }
+  browser()->profile()->GetPrefs()->SetInteger(
+      prefs::kSafeBrowsingSendFilesForMalwareCheck, state);
 }
 
 void DeepScanningBrowserTestBase::SetWaitPolicy(
     DelayDeliveryUntilVerdictValues state) {
-  if (use_legacy_policies_) {
-    g_browser_process->local_state()->SetInteger(
-        prefs::kDelayDeliveryUntilVerdict, state);
-  } else {
-    SetDelayDeliveryUntilVerdictPolicyForConnectors(state);
-  }
+  g_browser_process->local_state()->SetInteger(
+      prefs::kDelayDeliveryUntilVerdict, state);
 }
 
 void DeepScanningBrowserTestBase::SetAllowPasswordProtectedFilesPolicy(
     AllowPasswordProtectedFilesValues state) {
-  if (use_legacy_policies_) {
-    g_browser_process->local_state()->SetInteger(
-        prefs::kAllowPasswordProtectedFiles, state);
-  } else {
-    SetAllowPasswordProtectedFilesPolicyForConnectors(state);
-  }
+  g_browser_process->local_state()->SetInteger(
+      prefs::kAllowPasswordProtectedFiles, state);
 }
 
 void DeepScanningBrowserTestBase::SetBlockUnsupportedFileTypesPolicy(
     BlockUnsupportedFiletypesValues state) {
-  if (use_legacy_policies_) {
-    g_browser_process->local_state()->SetInteger(
-        prefs::kBlockUnsupportedFiletypes, state);
-  } else {
-    SetBlockUnsupportedFileTypesPolicyForConnectors(state);
-  }
+  g_browser_process->local_state()->SetInteger(
+      prefs::kBlockUnsupportedFiletypes, state);
 }
 
 void DeepScanningBrowserTestBase::SetBlockLargeFileTransferPolicy(
     BlockLargeFileTransferValues state) {
-  if (use_legacy_policies_) {
-    g_browser_process->local_state()->SetInteger(prefs::kBlockLargeFileTransfer,
-                                                 state);
-  } else {
-    SetBlockLargeFileTransferPolicyForConnectors(state);
-  }
+  g_browser_process->local_state()->SetInteger(prefs::kBlockLargeFileTransfer,
+                                               state);
 }
 
 void DeepScanningBrowserTestBase::SetUnsafeEventsReportingPolicy(bool report) {
@@ -176,44 +135,9 @@ void DeepScanningBrowserTestBase::SetUnsafeEventsReportingPolicy(bool report) {
 
 void DeepScanningBrowserTestBase::AddUrlToCheckComplianceOfDownloads(
     const std::string& url) {
-  if (use_legacy_policies_) {
-    ListPrefUpdate(g_browser_process->local_state(),
-                   prefs::kURLsToCheckComplianceOfDownloadedContent)
-        ->Append(url);
-  } else {
-    AddUrlsToCheckComplianceOfDownloadsForConnectors({url});
-  }
-}
-
-void DeepScanningBrowserTestBase::AddUrlToCheckForMalwareOfUploads(
-    const std::string& url) {
-  if (use_legacy_policies_) {
-    ListPrefUpdate(g_browser_process->local_state(),
-                   prefs::kURLsToCheckForMalwareOfUploadedContent)
-        ->Append(url);
-  } else {
-    AddUrlsToCheckForMalwareOfUploadsForConnectors({url});
-  }
-}
-
-void DeepScanningBrowserTestBase::ClearUrlsToCheckComplianceOfDownloads() {
-  if (use_legacy_policies_) {
-    ListPrefUpdate(g_browser_process->local_state(),
-                   prefs::kURLsToCheckComplianceOfDownloadedContent)
-        ->Clear();
-  } else {
-    ClearUrlsToCheckComplianceOfDownloadsForConnectors();
-  }
-}
-
-void DeepScanningBrowserTestBase::ClearUrlsToCheckForMalwareOfUploads() {
-  if (use_legacy_policies_) {
-    ListPrefUpdate(g_browser_process->local_state(),
-                   prefs::kURLsToCheckForMalwareOfUploadedContent)
-        ->Clear();
-  } else {
-    ClearUrlsToCheckForMalwareOfUploadsForConnectors();
-  }
+  ListPrefUpdate(g_browser_process->local_state(),
+                 prefs::kURLsToCheckComplianceOfDownloadedContent)
+      ->Append(url);
 }
 
 void DeepScanningBrowserTestBase::SetUpDelegate() {

chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_browsertest_base.h

@@ -15,10 +15,9 @@ namespace safe_browsing {
 // used by browser tests should be added to this class.
 class DeepScanningBrowserTestBase : public InProcessBrowserTest {
  public:
-  explicit DeepScanningBrowserTestBase(bool use_legacy_policies = true);
+  DeepScanningBrowserTestBase();
   ~DeepScanningBrowserTestBase() override;
 
-  void SetUpOnMainThread() override;
   void TearDownOnMainThread() override;
 
   // Setters for deep scanning policies.
@@ -32,9 +31,6 @@ class DeepScanningBrowserTestBase : public InProcessBrowserTest {
   void SetBlockLargeFileTransferPolicy(BlockLargeFileTransferValues state);
   void SetUnsafeEventsReportingPolicy(bool report);
   void AddUrlToCheckComplianceOfDownloads(const std::string& url);
-  void AddUrlToCheckForMalwareOfUploads(const std::string& url);
-  void ClearUrlsToCheckComplianceOfDownloads();
-  void ClearUrlsToCheckForMalwareOfUploads();
 
   // Sets up a FakeDeepScanningDialogDelegate to use this class's StatusCallback
   // and EncryptionStatusCallback. Also sets up a test DM token.
@@ -68,7 +64,6 @@ class DeepScanningBrowserTestBase : public InProcessBrowserTest {
   DeepScanningClientResponse status_callback_response_;
   base::ScopedTempDir temp_dir_;
   std::vector<base::FilePath> created_file_paths_;
-  bool use_legacy_policies_;
 };
 
 }  // namespace safe_browsing

chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_dialog_views_browsertest.cc

@@ -27,8 +27,10 @@ constexpr base::TimeDelta kNoDelay = base::TimeDelta::FromSeconds(0);
 constexpr base::TimeDelta kSmallDelay = base::TimeDelta::FromMilliseconds(300);
 constexpr base::TimeDelta kNormalDelay = base::TimeDelta::FromMilliseconds(500);
 
+enum class ScanType { ONLY_DLP, ONLY_MALWARE, DLP_AND_MALWARE };
+
 // Tests the behavior of the dialog in the following ways:
-// - It shows the appropriate buttons depending on its state.
+// - It shows the appropriate buttons depending on it's state.
 // - It transitions from states in the correct order.
 // - It respects time constraints (minimum shown time, initial delay, timeout)
 // - It is always destroyed, therefore |quit_closure_| is called in the dtor
@@ -37,13 +39,14 @@ class DeepScanningDialogViewsBehaviorBrowserTest
     : public DeepScanningBrowserTestBase,
       public DeepScanningDialogViews::TestObserver,
       public testing::WithParamInterface<
-          std::tuple<bool, bool, bool, base::TimeDelta>> {
+          std::tuple<ScanType, bool, bool, base::TimeDelta>> {
  public:
-  DeepScanningDialogViewsBehaviorBrowserTest()
-      : DeepScanningBrowserTestBase(std::get<0>(GetParam())) {
+  DeepScanningDialogViewsBehaviorBrowserTest() {
     DeepScanningDialogViews::SetObserverForTesting(this);
 
-    expected_scan_result_ = dlp_success() && malware_success();
+    bool dlp_result = !dlp_enabled() || dlp_success();
+    bool malware_result = !malware_enabled() || malware_success();
+    expected_scan_result_ = dlp_result && malware_result;
   }
 
   void ConstructorCalled(DeepScanningDialogViews* views,
@@ -155,6 +158,14 @@ class DeepScanningDialogViewsBehaviorBrowserTest
     CallQuitClosure();
   }
 
+  bool dlp_enabled() const {
+    return std::get<0>(GetParam()) != ScanType::ONLY_MALWARE;
+  }
+
+  bool malware_enabled() const {
+    return std::get<0>(GetParam()) != ScanType::ONLY_DLP;
+  }
+
   bool dlp_success() const { return std::get<1>(GetParam()); }
 
   bool malware_success() const { return std::get<2>(GetParam()); }
@@ -183,11 +194,9 @@ class DeepScanningDialogViewsBehaviorBrowserTest
 // - The "CancelledByUser" metrics are recorded.
 class DeepScanningDialogViewsCancelPendingScanBrowserTest
     : public DeepScanningBrowserTestBase,
-      public testing::WithParamInterface<bool>,
       public DeepScanningDialogViews::TestObserver {
  public:
-  DeepScanningDialogViewsCancelPendingScanBrowserTest()
-      : DeepScanningBrowserTestBase(GetParam()) {
+  DeepScanningDialogViewsCancelPendingScanBrowserTest() {
     DeepScanningDialogViews::SetObserverForTesting(this);
   }
 
@@ -229,11 +238,9 @@ class DeepScanningDialogViewsCancelPendingScanBrowserTest
 class DeepScanningDialogViewsWarningBrowserTest
     : public DeepScanningBrowserTestBase,
       public DeepScanningDialogViews::TestObserver,
-      public testing::WithParamInterface<
-          std::tuple<base::TimeDelta, bool, bool>> {
+      public testing::WithParamInterface<std::tuple<base::TimeDelta, bool>> {
  public:
-  DeepScanningDialogViewsWarningBrowserTest()
-      : DeepScanningBrowserTestBase(std::get<2>(GetParam())) {
+  DeepScanningDialogViewsWarningBrowserTest() {
     DeepScanningDialogViews::SetObserverForTesting(this);
   }
 
@@ -297,10 +304,9 @@ class DeepScanningDialogViewsAppearanceBrowserTest
     : public DeepScanningBrowserTestBase,
       public DeepScanningDialogViews::TestObserver,
       public testing::WithParamInterface<
-          std::tuple<bool, bool, DeepScanAccessPoint, bool>> {
+          std::tuple<bool, bool, DeepScanAccessPoint>> {
  public:
-  DeepScanningDialogViewsAppearanceBrowserTest()
-      : DeepScanningBrowserTestBase(std::get<3>(GetParam())) {
+  DeepScanningDialogViewsAppearanceBrowserTest() {
     DeepScanningDialogViews::SetObserverForTesting(this);
   }
 
@@ -405,13 +411,28 @@ constexpr char kTestUrl[] = "https://google.com";
 IN_PROC_BROWSER_TEST_P(DeepScanningDialogViewsBehaviorBrowserTest, Test) {
   base::ScopedAllowBlockingForTesting allow_blocking;
 
+  // The test is wrong if neither DLP or Malware is enabled. This would imply a
+  // Deep Scanning call site called ShowForWebContents without first checking
+  // IsEnabled returns true.
+  EXPECT_TRUE(dlp_enabled() || malware_enabled());
+
   // Setup policies to enable deep scanning, its UI and the responses to be
   // simulated.
-  SetDlpPolicy(CHECK_UPLOADS_AND_DOWNLOADS);
-  SetMalwarePolicy(SEND_UPLOADS_AND_DOWNLOADS);
-  AddUrlToCheckForMalwareOfUploads("*");
-  SetStatusCallbackResponse(SimpleDeepScanningClientResponseForTesting(
-      dlp_success(), malware_success()));
+  base::Optional<bool> dlp = base::nullopt;
+  base::Optional<bool> malware = base::nullopt;
+  if (dlp_enabled()) {
+    dlp = dlp_success();
+    SetDlpPolicy(CHECK_UPLOADS_AND_DOWNLOADS);
+  }
+  if (malware_enabled()) {
+    malware = malware_success();
+    SetMalwarePolicy(SEND_UPLOADS_AND_DOWNLOADS);
+    ListPrefUpdate(g_browser_process->local_state(),
+                   prefs::kURLsToCheckForMalwareOfUploadedContent)
+        ->Append("*");
+  }
+  SetStatusCallbackResponse(
+      SimpleDeepScanningClientResponseForTesting(dlp, malware));
 
   // Always set this policy so the UI is shown.
   SetWaitPolicy(DELAY_UPLOADS);
@@ -425,8 +446,8 @@ IN_PROC_BROWSER_TEST_P(DeepScanningDialogViewsBehaviorBrowserTest, Test) {
   SetQuitClosure(run_loop.QuitClosure());
 
   DeepScanningDialogDelegate::Data data;
-  data.do_dlp_scan = true;
-  data.do_malware_scan = true;
+  data.do_dlp_scan = dlp_enabled();
+  data.do_malware_scan = malware_enabled();
   CreateFilesForTest({"foo.doc"}, {"content"}, &data);
   ASSERT_TRUE(DeepScanningDialogDelegate::IsEnabled(
       browser()->profile(), GURL(kTestUrl), &data,
@@ -462,16 +483,18 @@ IN_PROC_BROWSER_TEST_P(DeepScanningDialogViewsBehaviorBrowserTest, Test) {
 //               more than its minimum duration (GetMinimumPendingDialogTime <
 //               kNormalDelay).
 INSTANTIATE_TEST_SUITE_P(
-    ,
+    DeepScanningDialogViewsBehaviorBrowserTest,
     DeepScanningDialogViewsBehaviorBrowserTest,
     testing::Combine(
-        /*use_legacy_policies*/ testing::Bool(),
+        /*scan_type*/ testing::Values(ScanType::ONLY_DLP,
+                                      ScanType::ONLY_MALWARE,
+                                      ScanType::DLP_AND_MALWARE),
         /*dlp_success*/ testing::Bool(),
         /*malware_success*/ testing::Bool(),
         /*response_delay*/
         testing::Values(kNoDelay, kSmallDelay, kNormalDelay)));
 
-IN_PROC_BROWSER_TEST_P(DeepScanningDialogViewsCancelPendingScanBrowserTest,
+IN_PROC_BROWSER_TEST_F(DeepScanningDialogViewsCancelPendingScanBrowserTest,
                        Test) {
   base::ScopedAllowBlockingForTesting allow_blocking;
 
@@ -519,10 +542,6 @@ IN_PROC_BROWSER_TEST_P(DeepScanningDialogViewsCancelPendingScanBrowserTest,
   ValidateMetrics();
 }
 
-INSTANTIATE_TEST_SUITE_P(,
-                         DeepScanningDialogViewsCancelPendingScanBrowserTest,
-                         /*use_legacy_policies=*/testing::Bool());
-
 IN_PROC_BROWSER_TEST_P(DeepScanningDialogViewsWarningBrowserTest, Test) {
   base::ScopedAllowBlockingForTesting allow_blocking;
 
@@ -577,12 +596,10 @@ IN_PROC_BROWSER_TEST_P(DeepScanningDialogViewsWarningBrowserTest, Test) {
   EXPECT_TRUE(called);
 }
 
-INSTANTIATE_TEST_SUITE_P(,
-                         DeepScanningDialogViewsWarningBrowserTest,
-                         testing::Combine(
-                             /*delay=*/testing::Values(kNoDelay, kSmallDelay),
-                             /*user_bypasses_warning=*/testing::Bool(),
-                             /*use_legacy_policies=*/testing::Bool()));
+INSTANTIATE_TEST_SUITE_P(
+    DeepScanningDialogViewsWarningBrowserTest,
+    DeepScanningDialogViewsWarningBrowserTest,
+    testing::Combine(testing::Values(kNoDelay, kSmallDelay), testing::Bool()));
 
 IN_PROC_BROWSER_TEST_P(DeepScanningDialogViewsAppearanceBrowserTest, Test) {
   base::ScopedAllowBlockingForTesting allow_blocking;
@@ -634,7 +651,7 @@ IN_PROC_BROWSER_TEST_P(DeepScanningDialogViewsAppearanceBrowserTest, Test) {
   EXPECT_TRUE(called);
 }
 
-INSTANTIATE_TEST_SUITE_P(,
+INSTANTIATE_TEST_SUITE_P(DeepScanningDialogViewsAppearanceBrowserTest,
                          DeepScanningDialogViewsAppearanceBrowserTest,
                          testing::Combine(
                              /*file_scan=*/testing::Bool(),
@@ -642,7 +659,6 @@ INSTANTIATE_TEST_SUITE_P(,
                              /*access_point=*/
                              testing::Values(DeepScanAccessPoint::UPLOAD,
                                              DeepScanAccessPoint::DRAG_AND_DROP,
-                                             DeepScanAccessPoint::PASTE),
-                             /*use_legacy_policies=*/testing::Bool()));
+                                             DeepScanAccessPoint::PASTE)));
 
 }  // namespace safe_browsing

chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_test_utils.cc

@@ -31,8 +31,6 @@ base::Value MakeListValue(const std::vector<std::string>& elements) {
 base::Value DefaultConnectorSettings() {
   base::Value settings(base::Value::Type::DICTIONARY);
 
-  settings.SetKey(enterprise_connectors::kKeyServiceProvider,
-                  base::Value("google"));
   settings.SetKey(enterprise_connectors::kKeyEnable,
                   base::Value(base::Value::Type::LIST));
   settings.SetKey(enterprise_connectors::kKeyDisable,
@@ -75,47 +73,9 @@ void AddConnectorUrlPattern(enterprise_connectors::AnalysisConnector connector,
   list->Append(std::move(list_element));
 }
 
-void ClearConnectorUrlPattern(
-    enterprise_connectors::AnalysisConnector connector,
-    bool enable,
-    base::Value tags) {
-  ListPrefUpdate settings_list(g_browser_process->local_state(),
-                               ConnectorPref(connector));
-  DCHECK(settings_list.Get());
-  if (settings_list->empty())
-    return;
-
-  base::Value* settings = nullptr;
-  DCHECK(settings_list->Get(0, &settings));
-  DCHECK(settings);
-  DCHECK(settings->is_dict());
-
-  base::Value* list =
-      settings->FindListPath(enable ? enterprise_connectors::kKeyEnable
-                                    : enterprise_connectors::kKeyDisable);
-  if (!list)
-    return;
-
-  DCHECK(list->is_list());
-  for (const base::Value& pattern : list->GetList()) {
-    DCHECK(pattern.is_dict());
-
-    const base::Value* pattern_tags =
-        pattern.FindKey(enterprise_connectors::kKeyTags);
-    if (!pattern_tags)
-      continue;
-
-    DCHECK(pattern_tags->is_list());
-    if (*pattern_tags == tags) {
-      list->EraseListValue(pattern);
-    }
-  }
-}
-
-template <typename T>
 void SetConnectorField(enterprise_connectors::AnalysisConnector connector,
                        const char* key,
-                       T value) {
+                       bool value) {
   InitConnectorPrefIfEmpty(connector);
   ListPrefUpdate settings_list(g_browser_process->local_state(),
                                ConnectorPref(connector));
@@ -123,7 +83,7 @@ void SetConnectorField(enterprise_connectors::AnalysisConnector connector,
   DCHECK(settings_list->Get(0, &settings));
   DCHECK(settings);
   DCHECK(settings->is_dict());
-  DCHECK(settings->SetKey(key, base::Value(std::move(value))));
+  settings->SetKey(key, base::Value(std::move(value)));
 }
 
 }  // namespace
@@ -393,6 +353,7 @@ void SetDlpPolicyForConnectors(CheckContentComplianceValues state) {
   // wildcard pattern should also be included in the disable list if the policy
   // is disabled for downloads since no scan can occur with the legacy policy
   // when it is disabled.
+
   bool enable_uploads =
       state == CHECK_UPLOADS || state == CHECK_UPLOADS_AND_DOWNLOADS;
 
@@ -444,11 +405,10 @@ void SetMalwarePolicyForConnectors(SendFilesForMalwareCheckValues state) {
 
 void SetDelayDeliveryUntilVerdictPolicyForConnectors(
     DelayDeliveryUntilVerdictValues state) {
-  int delay_uploads =
-      (state == DELAY_UPLOADS || state == DELAY_UPLOADS_AND_DOWNLOADS) ? 1 : 0;
-  int delay_downloads =
-      (state == DELAY_DOWNLOADS || state == DELAY_UPLOADS_AND_DOWNLOADS) ? 1
-                                                                         : 0;
+  bool delay_uploads =
+      state == DELAY_UPLOADS || state == DELAY_UPLOADS_AND_DOWNLOADS;
+  bool delay_downloads =
+      state == DELAY_DOWNLOADS || state == DELAY_UPLOADS_AND_DOWNLOADS;
   SetConnectorField(enterprise_connectors::AnalysisConnector::BULK_DATA_ENTRY,
                     enterprise_connectors::kKeyBlockUntilVerdict,
                     delay_uploads);
@@ -468,10 +428,10 @@ void SetAllowPasswordProtectedFilesPolicyForConnectors(
       state == ALLOW_DOWNLOADS || state == ALLOW_UPLOADS_AND_DOWNLOADS;
   SetConnectorField(enterprise_connectors::AnalysisConnector::FILE_ATTACHED,
                     enterprise_connectors::kKeyBlockPasswordProtected,
-                    !allow_uploads);
+                    allow_uploads);
   SetConnectorField(enterprise_connectors::AnalysisConnector::FILE_DOWNLOADED,
                     enterprise_connectors::kKeyBlockPasswordProtected,
-                    !allow_downloads);
+                    allow_downloads);
 }
 
 void SetBlockUnsupportedFileTypesPolicyForConnectors(
@@ -537,18 +497,4 @@ void AddUrlsToNotCheckForMalwareOfDownloadsForConnectors(
       MakeListValue(urls), MakeListValue({"malware"}));
 }
 
-void ClearUrlsToCheckComplianceOfDownloadsForConnectors() {
-  ClearConnectorUrlPattern(
-      enterprise_connectors::AnalysisConnector::FILE_DOWNLOADED, true,
-      MakeListValue({"dlp"}));
-}
-
-void ClearUrlsToCheckForMalwareOfUploadsForConnectors() {
-  for (auto connector :
-       {enterprise_connectors::AnalysisConnector::FILE_ATTACHED,
-        enterprise_connectors::AnalysisConnector::BULK_DATA_ENTRY}) {
-    ClearConnectorUrlPattern(connector, true, MakeListValue({"malware"}));
-  }
-}
-
 }  // namespace safe_browsing

chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_test_utils.h

@@ -126,8 +126,6 @@ void AddUrlsToCheckForMalwareOfUploadsForConnectors(
     const std::vector<std::string>& urls);
 void AddUrlsToNotCheckForMalwareOfDownloadsForConnectors(
     const std::vector<std::string>& urls);
-void ClearUrlsToCheckComplianceOfDownloadsForConnectors();
-void ClearUrlsToCheckForMalwareOfUploadsForConnectors();
 
 }  // namespace safe_browsing