Reland "Update Deep Scanning upload UI text"

This reverts commit 5bd704b2.

Reason for revert: The fix is applied in crrev.com/c/2024497

Original change's description:
> Revert "Update Deep Scanning upload UI text"
> 
> This reverts commit 75458c57.
> 
> Reason for revert: to unblock reverting https://chromium-review.googlesource.com/c/chromium/src/+/2020891 (crbug.com/1046693)
> 
> Original change's description:
> > Update Deep Scanning upload UI text
> > 
> > Add code to use the appropriate drag-data, drag-file and paste strings
> > instead of just defaulting to the upload strings. Removes the optional
> > part of the access point since it's used to determine the appropriate
> > string now.
> > 
> > Bug: 999145
> > Change-Id: I115cd567f94d9c4ca7a4befdff386ba76163ae20
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2016965
> > Commit-Queue: Dominique Fauteux-Chapleau <domfc@chromium.org>
> > Reviewed-by: Daniel Rubery <drubery@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#735943}
> 
> TBR=drubery@chromium.org,domfc@chromium.org
> 
> Change-Id: I78b6b5c3c3fe10cdd731d84233d20c31cb1a9e00
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 999145,1046693
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2027547
> Reviewed-by: vitaliii <vitaliii@chromium.org>
> Commit-Queue: vitaliii <vitaliii@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#736301}

TBR=vitaliii@chromium.org,drubery@chromium.org,domfc@chromium.org

Change-Id: I717f12ae775142aa6337d7aefc70c426b19d22f3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 999145, 1046693
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2026652Reviewed-by: Daniel Rubery <drubery@chromium.org>
Commit-Queue: Dominique Fauteux-Chapleau <domfc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736428}

chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_dialog_delegate_unittest.cc

@@ -103,8 +103,9 @@ class BaseTest : public testing::Test {
   void ScanUpload(content::WebContents* web_contents,
                   DeepScanningDialogDelegate::Data data,
                   DeepScanningDialogDelegate::CompletionCallback callback) {
-    // The access point is only used for metrics, so its value doesn't affect
-    // the rest of the tests and can always be the same.
+    // The access point is only used for metrics and choosing the dialog text if
+    // one is shown, so its value doesn't affect the tests in this file and can
+    // always be the same.
     DeepScanningDialogDelegate::ShowForWebContents(
         web_contents, std::move(data), std::move(callback),
         DeepScanAccessPoint::UPLOAD);

chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_dialog_views.cc

@@ -102,7 +102,7 @@ class DeepScanningTopImageView : public views::ImageView {
 DeepScanningDialogViews::DeepScanningDialogViews(
     std::unique_ptr<DeepScanningDialogDelegate> delegate,
     content::WebContents* web_contents,
-    base::Optional<DeepScanAccessPoint> access_point,
+    DeepScanAccessPoint access_point,
     bool is_file_scan)
     : delegate_(std::move(delegate)),
       web_contents_(web_contents),
@@ -274,13 +274,19 @@ void DeepScanningDialogViews::SetupButtons() {
 }
 
 base::string16 DeepScanningDialogViews::GetDialogMessage() const {
-  if (is_pending()) {
-    return l10n_util::GetStringUTF16(
-        IDS_DEEP_SCANNING_DIALOG_UPLOAD_PENDING_MESSAGE);
+  int text_id;
+  switch (dialog_status_) {
+    case DeepScanningDialogStatus::PENDING:
+      text_id = GetPendingMessageId();
+      break;
+    case DeepScanningDialogStatus::FAILURE:
+      text_id = GetFailureMessageId();
+      break;
+    case DeepScanningDialogStatus::SUCCESS:
+      text_id = IDS_DEEP_SCANNING_DIALOG_SUCCESS_MESSAGE;
+      break;
   }
-  return l10n_util::GetStringUTF16(
-      is_success() ? IDS_DEEP_SCANNING_DIALOG_SUCCESS_MESSAGE
-                   : IDS_DEEP_SCANNING_DIALOG_UPLOAD_FAILURE_MESSAGE);
+  return l10n_util::GetStringUTF16(text_id);
 }
 
 base::string16 DeepScanningDialogViews::GetCancelButtonText() const {
@@ -402,14 +408,48 @@ int DeepScanningDialogViews::GetUploadImageId(bool use_dark) const {
   return use_dark ? IDR_UPLOAD_VIOLATION_DARK : IDR_UPLOAD_VIOLATION;
 }
 
+int DeepScanningDialogViews::GetPendingMessageId() const {
+  DCHECK(is_pending());
+  switch (access_point_) {
+    case DeepScanAccessPoint::DOWNLOAD:
+      // This dialog should not appear on the download path. If it somehow does,
+      // treat it as an upload.
+      NOTREACHED();
+      FALLTHROUGH;
+    case DeepScanAccessPoint::UPLOAD:
+      return IDS_DEEP_SCANNING_DIALOG_UPLOAD_PENDING_MESSAGE;
+    case DeepScanAccessPoint::PASTE:
+      return IDS_DEEP_SCANNING_DIALOG_PASTE_PENDING_MESSAGE;
+    case DeepScanAccessPoint::DRAG_AND_DROP:
+      return is_file_scan_ ? IDS_DEEP_SCANNING_DIALOG_DRAG_FILES_PENDING_MESSAGE
+                           : IDS_DEEP_SCANNING_DIALOG_DRAG_DATA_PENDING_MESSAGE;
+  }
+}
+
+int DeepScanningDialogViews::GetFailureMessageId() const {
+  DCHECK(is_failure());
+  switch (access_point_) {
+    case DeepScanAccessPoint::DOWNLOAD:
+      // This dialog should not appear on the download path. If it somehow does,
+      // treat it as an upload.
+      NOTREACHED();
+      FALLTHROUGH;
+    case DeepScanAccessPoint::UPLOAD:
+      return IDS_DEEP_SCANNING_DIALOG_UPLOAD_FAILURE_MESSAGE;
+    case DeepScanAccessPoint::PASTE:
+      return IDS_DEEP_SCANNING_DIALOG_PASTE_FAILURE_MESSAGE;
+    case DeepScanAccessPoint::DRAG_AND_DROP:
+      return is_file_scan_ ? IDS_DEEP_SCANNING_DIALOG_DRAG_FILES_FAILURE_MESSAGE
+                           : IDS_DEEP_SCANNING_DIALOG_DRAG_DATA_FAILURE_MESSAGE;
+  }
+}
+
 const gfx::ImageSkia* DeepScanningDialogViews::GetTopImage() const {
   const bool use_dark =
       color_utils::IsDark(GetBubbleFrameView()->GetBackgroundColor());
   const bool treat_as_text_paste =
-      access_point_.has_value() &&
-      (access_point_.value() == DeepScanAccessPoint::PASTE ||
-       (access_point_.value() == DeepScanAccessPoint::DRAG_AND_DROP &&
-        !is_file_scan_));
+      access_point_ == DeepScanAccessPoint::PASTE ||
+      (access_point_ == DeepScanAccessPoint::DRAG_AND_DROP && !is_file_scan_);
 
   int image_id = treat_as_text_paste ? GetPasteImageId(use_dark)
                                      : GetUploadImageId(use_dark);

chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_dialog_views.h

@@ -54,7 +54,7 @@ class DeepScanningDialogViews : public views::DialogDelegate {
   };
   DeepScanningDialogViews(std::unique_ptr<DeepScanningDialogDelegate> delegate,
                           content::WebContents* web_contents,
-                          base::Optional<DeepScanAccessPoint> access_point,
+                          DeepScanAccessPoint access_point,
                           bool is_file_scan);
 
   // views::DialogDelegate:
@@ -120,6 +120,14 @@ class DeepScanningDialogViews : public views::DialogDelegate {
   // Returns the appropriate upload top image ID depending on |dialog_status_|.
   int GetUploadImageId(bool use_dark) const;
 
+  // Returns the appropriate pending message ID depending on |access_point_| and
+  // |is_file_scan_|.
+  int GetPendingMessageId() const;
+
+  // Returns the appropriate failure message ID depending on |access_point_| and
+  // |is_file_scan_|.
+  int GetFailureMessageId() const;
+
   // Show the dialog. Sets |shown_| to true.
   void Show();
 
@@ -148,7 +156,7 @@ class DeepScanningDialogViews : public views::DialogDelegate {
 
   // The access point that caused this dialog to open. This changes what text
   // and top image are shown to the user.
-  base::Optional<DeepScanAccessPoint> access_point_;
+  DeepScanAccessPoint access_point_;
 
   // Indicates whether the scan being done is for files or for text. This
   // changes what text and top image are shown to the user.