Fix FILE_ENCRYPTED usage on Deep Scanning upload

This result now records metrics and events correctly instead of passing
as a SUCCESS result.

Bug: 1049712
Change-Id: Ic104d271e53c13d0b78942dfb57effe59e1ef522
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2042216Reviewed-by: Daniel Rubery <drubery@chromium.org>
Commit-Queue: Dominique Fauteux-Chapleau <domfc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#740727}

chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_dialog_delegate.cc

@@ -170,6 +170,12 @@ std::string GetFileMimeType(base::FilePath path) {
   return mime_type;
 }
 
+bool AllowEncryptedFiles() {
+  int state = g_browser_process->local_state()->GetInteger(
+      prefs::kAllowPasswordProtectedFiles);
+  return state == ALLOW_UPLOADS || state == ALLOW_UPLOADS_AND_DOWNLOADS;
+}
+
 }  // namespace
 
 // A BinaryUploadService::Request implementation that gets the data to scan
@@ -269,8 +275,9 @@ bool DeepScanningDialogDelegate::ResultShouldAllowDataUse(
       return true;
 
     case BinaryUploadService::Result::FILE_TOO_LARGE:
-    case BinaryUploadService::Result::FILE_ENCRYPTED:
       return false;
+    case BinaryUploadService::Result::FILE_ENCRYPTED:
+      return AllowEncryptedFiles();
   }
 }
 
@@ -555,13 +562,8 @@ void DeepScanningDialogDelegate::AnalyzerCallback(
   // If the file contains encrypted parts and the user is not allowed to use
   // them, fail the request.
   if (contains_encrypted_parts) {
-    int state = g_browser_process->local_state()->GetInteger(
-        prefs::kAllowPasswordProtectedFiles);
-    BinaryUploadService::Result result =
-        state == ALLOW_UPLOADS || state == ALLOW_UPLOADS_AND_DOWNLOADS
-            ? BinaryUploadService::Result::SUCCESS
-            : BinaryUploadService::Result::FILE_ENCRYPTED;
-    FileRequestCallback(data_.paths[index], result,
+    FileRequestCallback(data_.paths[index],
+                        BinaryUploadService::Result::FILE_ENCRYPTED,
                         DeepScanningClientResponse());
     return;
   }

chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_dialog_delegate_unittest.cc

@@ -127,6 +127,8 @@ class BaseTest : public testing::Test {
   TestingProfile* profile_;
 };
 
+}  // namespace
+
 using DeepScanningDialogDelegateIsEnabledTest = BaseTest;
 
 TEST_F(DeepScanningDialogDelegateIsEnabledTest, NoFeatureNoDMTokenNoPref) {
@@ -1433,6 +1435,28 @@ INSTANTIATE_TEST_SUITE_P(
                     BinaryUploadService::Result::UNAUTHORIZED,
                     BinaryUploadService::Result::FILE_ENCRYPTED));
 
-}  // namespace
+using DeepScanningDialogDelegatePolicyResultsTest = BaseTest;
+
+TEST_F(DeepScanningDialogDelegatePolicyResultsTest,
+       AllowPasswordProtectedFiles) {
+  // The value returned by ResultShouldAllowDataUse for FILE_ENCRYPTED should
+  // match the AllowPasswordProtectedFiles policy.
+  SetAllowPasswordPolicy(
+      AllowPasswordProtectedFilesValues::ALLOW_UPLOADS_AND_DOWNLOADS);
+  EXPECT_TRUE(DeepScanningDialogDelegate::ResultShouldAllowDataUse(
+      BinaryUploadService::Result::FILE_ENCRYPTED));
+
+  SetAllowPasswordPolicy(AllowPasswordProtectedFilesValues::ALLOW_DOWNLOADS);
+  EXPECT_FALSE(DeepScanningDialogDelegate::ResultShouldAllowDataUse(
+      BinaryUploadService::Result::FILE_ENCRYPTED));
+
+  SetAllowPasswordPolicy(AllowPasswordProtectedFilesValues::ALLOW_UPLOADS);
+  EXPECT_TRUE(DeepScanningDialogDelegate::ResultShouldAllowDataUse(
+      BinaryUploadService::Result::FILE_ENCRYPTED));
+
+  SetAllowPasswordPolicy(AllowPasswordProtectedFilesValues::ALLOW_NONE);
+  EXPECT_FALSE(DeepScanningDialogDelegate::ResultShouldAllowDataUse(
+      BinaryUploadService::Result::FILE_ENCRYPTED));
+}
 
 }  // namespace safe_browsing