Reland "Handle Safety Tip learn more link in page info"

This is a reland of a9df5b29

Differences from original cl:
- PageInfoUI::SecurityDescription GetSecurityDetails() changed to
PageInfoUI::SecurityDescriptionType GetSecurityDescriptionType()
- Initialize security_description_type_ in the header file
- In safety_tip_page_info_bubble_view_browsertest, static cast to a
regular page info bubble instead of safety tip bubble for
CheckPageInfoDoesNotShowSafetyTipInfo

Original change's description:
> Handle Safety Tip learn more link in page info
>
> Bug: 1007497
> Change-Id: I4498d39cabf4736a697294ad027082a53894a623
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1857166
> Reviewed-by: Joe DeBlasio <jdeblasio@chromium.org>
> Reviewed-by: Emily Stark <estark@chromium.org>
> Commit-Queue: Livvie Lin <livvielin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#706076}

Bug: 1007497
Change-Id: I8dcebe8a7ab974e72eea24280578f8f6830031b3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1867478Reviewed-by: Joe DeBlasio <jdeblasio@chromium.org>
Reviewed-by: Emily Stark <estark@chromium.org>
Commit-Queue: Livvie Lin <livvielin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708046}

chrome/browser/ui/page_info/page_info_ui.cc

@@ -187,12 +187,14 @@ base::span<const PermissionsUIInfo> GetContentSettingsUIInfo() {
 std::unique_ptr<PageInfoUI::SecurityDescription> CreateSecurityDescription(
     PageInfoUI::SecuritySummaryColor style,
     int summary_id,
-    int details_id) {
+    int details_id,
+    PageInfoUI::SecurityDescriptionType type) {
   std::unique_ptr<PageInfoUI::SecurityDescription> security_description(
       new PageInfoUI::SecurityDescription());
   security_description->summary_style = style;
   security_description->summary = l10n_util::GetStringUTF16(summary_id);
   security_description->details = l10n_util::GetStringUTF16(details_id);
+  security_description->type = type;
   return security_description;
 }
 
@@ -209,6 +211,7 @@ CreateSecurityDescriptionForLookalikeSafetyTip(const GURL& safe_url) {
       IDS_PAGE_INFO_SAFETY_TIP_LOOKALIKE_TITLE, safe_host);
   security_description->details = l10n_util::GetStringFUTF16(
       IDS_PAGE_INFO_SAFETY_TIP_LOOKALIKE_DESCRIPTION, safe_host);
+  security_description->type = PageInfoUI::SecurityDescriptionType::SAFETY_TIP;
   return security_description;
 }
 
@@ -272,15 +275,18 @@ PageInfoUI::GetSecurityDescription(const IdentityInfo& identity_info) const {
     case PageInfo::SAFE_BROWSING_STATUS_MALWARE:
       return CreateSecurityDescription(SecuritySummaryColor::RED,
                                        IDS_PAGE_INFO_MALWARE_SUMMARY,
-                                       IDS_PAGE_INFO_MALWARE_DETAILS);
+                                       IDS_PAGE_INFO_MALWARE_DETAILS,
+                                       SecurityDescriptionType::SAFE_BROWSING);
     case PageInfo::SAFE_BROWSING_STATUS_SOCIAL_ENGINEERING:
-      return CreateSecurityDescription(
-          SecuritySummaryColor::RED, IDS_PAGE_INFO_SOCIAL_ENGINEERING_SUMMARY,
-          IDS_PAGE_INFO_SOCIAL_ENGINEERING_DETAILS);
+      return CreateSecurityDescription(SecuritySummaryColor::RED,
+                                       IDS_PAGE_INFO_SOCIAL_ENGINEERING_SUMMARY,
+                                       IDS_PAGE_INFO_SOCIAL_ENGINEERING_DETAILS,
+                                       SecurityDescriptionType::SAFE_BROWSING);
     case PageInfo::SAFE_BROWSING_STATUS_UNWANTED_SOFTWARE:
       return CreateSecurityDescription(SecuritySummaryColor::RED,
                                        IDS_PAGE_INFO_UNWANTED_SOFTWARE_SUMMARY,
-                                       IDS_PAGE_INFO_UNWANTED_SOFTWARE_DETAILS);
+                                       IDS_PAGE_INFO_UNWANTED_SOFTWARE_DETAILS,
+                                       SecurityDescriptionType::SAFE_BROWSING);
     case PageInfo::SAFE_BROWSING_STATUS_SAVED_PASSWORD_REUSE:
     case PageInfo::SAFE_BROWSING_STATUS_SIGNED_IN_SYNC_PASSWORD_REUSE:
     case PageInfo::SAFE_BROWSING_STATUS_SIGNED_IN_NON_SYNC_PASSWORD_REUSE:
@@ -293,7 +299,8 @@ PageInfoUI::GetSecurityDescription(const IdentityInfo& identity_info) const {
     case PageInfo::SAFE_BROWSING_STATUS_BILLING:
       return CreateSecurityDescription(SecuritySummaryColor::RED,
                                        IDS_PAGE_INFO_BILLING_SUMMARY,
-                                       IDS_PAGE_INFO_BILLING_DETAILS);
+                                       IDS_PAGE_INFO_BILLING_DETAILS,
+                                       SecurityDescriptionType::SAFE_BROWSING);
   }
 
   std::unique_ptr<SecurityDescription> safety_tip_security_desc =
@@ -307,9 +314,9 @@ PageInfoUI::GetSecurityDescription(const IdentityInfo& identity_info) const {
 #if defined(OS_ANDROID)
       // We provide identical summary and detail strings for Android, which
       // deduplicates them in the UI code.
-      return CreateSecurityDescription(SecuritySummaryColor::GREEN,
-                                       IDS_PAGE_INFO_INTERNAL_PAGE,
-                                       IDS_PAGE_INFO_INTERNAL_PAGE);
+      return CreateSecurityDescription(
+          SecuritySummaryColor::GREEN, IDS_PAGE_INFO_INTERNAL_PAGE,
+          IDS_PAGE_INFO_INTERNAL_PAGE, SecurityDescriptionType::INTERNAL);
 #else
       // Internal pages on desktop have their own UI implementations which
       // should never call this function.
@@ -325,23 +332,28 @@ PageInfoUI::GetSecurityDescription(const IdentityInfo& identity_info) const {
         case PageInfo::SITE_CONNECTION_STATUS_INSECURE_ACTIVE_SUBRESOURCE:
           return CreateSecurityDescription(SecuritySummaryColor::RED,
                                            IDS_PAGE_INFO_NOT_SECURE_SUMMARY,
-                                           IDS_PAGE_INFO_NOT_SECURE_DETAILS);
+                                           IDS_PAGE_INFO_NOT_SECURE_DETAILS,
+                                           SecurityDescriptionType::CONNECTION);
         case PageInfo::SITE_CONNECTION_STATUS_INSECURE_FORM_ACTION:
           return CreateSecurityDescription(SecuritySummaryColor::RED,
                                            IDS_PAGE_INFO_MIXED_CONTENT_SUMMARY,
-                                           IDS_PAGE_INFO_NOT_SECURE_DETAILS);
+                                           IDS_PAGE_INFO_NOT_SECURE_DETAILS,
+                                           SecurityDescriptionType::CONNECTION);
         case PageInfo::SITE_CONNECTION_STATUS_INSECURE_PASSIVE_SUBRESOURCE:
           return CreateSecurityDescription(SecuritySummaryColor::RED,
                                            IDS_PAGE_INFO_MIXED_CONTENT_SUMMARY,
-                                           IDS_PAGE_INFO_MIXED_CONTENT_DETAILS);
+                                           IDS_PAGE_INFO_MIXED_CONTENT_DETAILS,
+                                           SecurityDescriptionType::CONNECTION);
         case PageInfo::SITE_CONNECTION_STATUS_LEGACY_TLS:
           return CreateSecurityDescription(SecuritySummaryColor::RED,
                                            IDS_PAGE_INFO_MIXED_CONTENT_SUMMARY,
-                                           IDS_PAGE_INFO_LEGACY_TLS_DETAILS);
+                                           IDS_PAGE_INFO_LEGACY_TLS_DETAILS,
+                                           SecurityDescriptionType::CONNECTION);
         default:
           return CreateSecurityDescription(SecuritySummaryColor::GREEN,
                                            IDS_PAGE_INFO_SECURE_SUMMARY,
-                                           IDS_PAGE_INFO_SECURE_DETAILS);
+                                           IDS_PAGE_INFO_SECURE_DETAILS,
+                                           SecurityDescriptionType::CONNECTION);
       }
     case PageInfo::SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM:
     case PageInfo::SITE_IDENTITY_STATUS_UNKNOWN:
@@ -349,7 +361,8 @@ PageInfoUI::GetSecurityDescription(const IdentityInfo& identity_info) const {
     default:
       return CreateSecurityDescription(SecuritySummaryColor::RED,
                                        IDS_PAGE_INFO_NOT_SECURE_SUMMARY,
-                                       IDS_PAGE_INFO_NOT_SECURE_DETAILS);
+                                       IDS_PAGE_INFO_NOT_SECURE_DETAILS,
+                                       SecurityDescriptionType::CONNECTION);
   }
 }
 
@@ -696,7 +709,8 @@ PageInfoUI::CreateSafetyTipSecurityDescription(
       return CreateSecurityDescription(
           SecuritySummaryColor::RED,
           IDS_PAGE_INFO_SAFETY_TIP_BAD_REPUTATION_TITLE,
-          IDS_PAGE_INFO_SAFETY_TIP_BAD_REPUTATION_DESCRIPTION);
+          IDS_PAGE_INFO_SAFETY_TIP_BAD_REPUTATION_DESCRIPTION,
+          PageInfoUI::SecurityDescriptionType::SAFETY_TIP);
     case security_state::SafetyTipStatus::kLookalike:
       return CreateSecurityDescriptionForLookalikeSafetyTip(info.safe_url);
 

chrome/browser/ui/page_info/page_info_ui.h

@@ -43,6 +43,19 @@ class PageInfoUI {
     GREEN,
   };
 
+  enum class SecurityDescriptionType {
+    // The UI describes whether the connection is secure, e.g. secure
+    // HTTPS, non-secure HTTP.
+    CONNECTION,
+    // The UI describes e.g. an internal (chrome://) page or extension page.
+    INTERNAL,
+    // The UI describes a Safe Browsing warning, e.g. site deceptive or contains
+    // malware.
+    SAFE_BROWSING,
+    // The UI shows a Safety Tip.
+    SAFETY_TIP,
+  };
+
   struct SecurityDescription {
     // The text style for |summary| used to color it. This provides an
     // opinionated guide to the user on the overall security state of the site.
@@ -52,6 +65,9 @@ class PageInfoUI {
     // A short paragraph with more details about the state, and how
     // the user should treat it.
     base::string16 details;
+    // The category of the security description, used to determine which help
+    // center article to link to.
+    SecurityDescriptionType type;
   };
 
   // |CookieInfo| contains information about the cookies from a specific source.

chrome/browser/ui/page_info/page_info_unittest.cc

@@ -116,6 +116,7 @@ class MockPageInfoUI : public PageInfoUI {
         l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_SUMMARY);
     security_description->details =
         l10n_util::GetStringUTF16(IDS_PAGE_INFO_CHANGE_PASSWORD_DETAILS);
+    security_description->type = SecurityDescriptionType::SAFE_BROWSING;
     return security_description;
   }
 #endif

chrome/browser/ui/views/page_info/page_info_bubble_view.cc

@@ -20,6 +20,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/lookalikes/safety_tips/safety_tip_ui_helper.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/security_state_tab_helper.h"
@@ -734,8 +735,8 @@ void PageInfoBubbleView::SetIdentityInfo(const IdentityInfo& identity_info) {
   std::unique_ptr<PageInfoUI::SecurityDescription> security_description =
       GetSecurityDescription(identity_info);
 
-  // Set the bubble title, update the title label text, then apply color.
   set_window_title(security_description->summary);
+  set_security_description_type(security_description->type);
   GetBubbleFrameView()->UpdateWindowTitle();
   int text_style = views::style::STYLE_PRIMARY;
   switch (security_description->summary_style) {
@@ -934,6 +935,7 @@ PageInfoBubbleView::CreateSecurityDescriptionForPasswordReuse() const {
       GetPasswordProtectionService(profile_);
   security_description->details = service->GetWarningDetailText(
       service->reused_password_account_type_for_last_shown_warning());
+  security_description->type = SecurityDescriptionType::SAFE_BROWSING;
   return security_description;
 }
 #endif
@@ -993,12 +995,16 @@ void PageInfoBubbleView::StyledLabelLinkClicked(views::StyledLabel* label,
                                                 int event_flags) {
   switch (label->GetID()) {
     case PageInfoBubbleView::VIEW_ID_PAGE_INFO_LABEL_SECURITY_DETAILS:
-      web_contents()->OpenURL(content::OpenURLParams(
-          GURL(chrome::kPageInfoHelpCenterURL), content::Referrer(),
-          WindowOpenDisposition::NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK,
-          false));
-      presenter_->RecordPageInfoAction(
-          PageInfo::PAGE_INFO_CONNECTION_HELP_OPENED);
+      if (GetSecurityDescriptionType() == SecurityDescriptionType::SAFETY_TIP) {
+        safety_tips::OpenHelpCenter(web_contents());
+      } else {
+        web_contents()->OpenURL(content::OpenURLParams(
+            GURL(chrome::kPageInfoHelpCenterURL), content::Referrer(),
+            WindowOpenDisposition::NEW_FOREGROUND_TAB, ui::PAGE_TRANSITION_LINK,
+            false));
+        presenter_->RecordPageInfoAction(
+            PageInfo::PAGE_INFO_CONNECTION_HELP_OPENED);
+      }
       break;
     case PageInfoBubbleView::
         VIEW_ID_PAGE_INFO_LABEL_RESET_CERTIFICATE_DECISIONS:

chrome/browser/ui/views/page_info/page_info_bubble_view_base.cc

@@ -6,6 +6,7 @@
 
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/page_info/page_info_dialog.h"
+#include "chrome/browser/ui/page_info/page_info_ui.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/buildflags.h"
@@ -71,6 +72,11 @@ void PageInfoBubbleViewBase::OnWidgetDestroying(views::Widget* widget) {
   g_page_info_bubble = nullptr;
 }
 
+PageInfoUI::SecurityDescriptionType
+PageInfoBubbleViewBase::GetSecurityDescriptionType() const {
+  return security_description_type_;
+}
+
 void PageInfoBubbleViewBase::RenderFrameDeleted(
     content::RenderFrameHost* render_frame_host) {
   if (render_frame_host == web_contents()->GetMainFrame()) {

chrome/browser/ui/views/page_info/page_info_bubble_view_base.h

@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PAGE_INFO_BUBBLE_VIEW_BASE_H_
 #define CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PAGE_INFO_BUBBLE_VIEW_BASE_H_
 
+#include "chrome/browser/ui/page_info/page_info_ui.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/bubble/bubble_dialog_delegate_view.h"
@@ -56,9 +57,16 @@ class PageInfoBubbleViewBase : public views::BubbleDialogDelegateView,
   bool ShouldShowCloseButton() const override;
   void OnWidgetDestroying(views::Widget* widget) override;
 
+  PageInfoUI::SecurityDescriptionType GetSecurityDescriptionType() const;
   void set_window_title(const base::string16& title) { window_title_ = title; }
+  void set_security_description_type(
+      const PageInfoUI::SecurityDescriptionType& type) {
+    security_description_type_ = type;
+  }
 
  private:
+  friend class SafetyTipPageInfoBubbleViewBrowserTest;
+
   // WebContentsObserver:
   void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
   void OnVisibilityChanged(content::Visibility visibility) override;
@@ -66,6 +74,8 @@ class PageInfoBubbleViewBase : public views::BubbleDialogDelegateView,
   void DidChangeVisibleSecurityState() override;
 
   base::string16 window_title_;
+  PageInfoUI::SecurityDescriptionType security_description_type_ =
+      PageInfoUI::SecurityDescriptionType::CONNECTION;
 
   DISALLOW_COPY_AND_ASSIGN(PageInfoBubbleViewBase);
 };

chrome/browser/ui/views/page_info/page_info_bubble_view_unittest.cc

@@ -91,6 +91,9 @@ class PageInfoBubbleViewTestApi {
   views::Widget::ClosedReason closed_reason() const { return *closed_reason_; }
 
   base::string16 GetWindowTitle() { return view_->GetWindowTitle(); }
+  PageInfoUI::SecurityDescriptionType GetSecurityDescriptionType() {
+    return view_->GetSecurityDescriptionType();
+  }
 
   PermissionSelectorRow* GetPermissionSelectorAt(int index) {
     return view_->selector_rows_[index].get();
@@ -691,6 +694,8 @@ TEST_F(PageInfoBubbleViewTest, OpenPageInfoBubbleAfterNavigationStart) {
   api_->CreateView();
   EXPECT_EQ(l10n_util::GetStringUTF16(IDS_PAGE_INFO_NOT_SECURE_SUMMARY),
             api_->GetWindowTitle());
+  EXPECT_EQ(PageInfoUI::SecurityDescriptionType::CONNECTION,
+            api_->GetSecurityDescriptionType());
 
   // Set up a test SSLInfo so that Page Info sees the connection as secure.
   uint16_t cipher_suite = 0xc02f;  // TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
@@ -709,6 +714,8 @@ TEST_F(PageInfoBubbleViewTest, OpenPageInfoBubbleAfterNavigationStart) {
   navigation->Commit();
   EXPECT_EQ(l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURE_SUMMARY),
             api_->GetWindowTitle());
+  EXPECT_EQ(PageInfoUI::SecurityDescriptionType::CONNECTION,
+            api_->GetSecurityDescriptionType());
 }
 
 TEST_F(PageInfoBubbleViewTest, EnsureCloseCallback) {

chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc

@@ -242,8 +242,8 @@ class SafetyTipPageInfoBubbleViewBrowserTest
     }
 
     OpenPageInfoBubble(browser);
-    views::BubbleDialogDelegateView* page_info =
-        PageInfoBubbleViewBase::GetPageInfoBubbleForTesting();
+    auto* page_info = static_cast<SafetyTipPageInfoBubbleView*>(
+        PageInfoBubbleViewBase::GetPageInfoBubbleForTesting());
     ASSERT_TRUE(page_info);
 
     switch (expected_safety_tip_status) {
@@ -267,16 +267,20 @@ class SafetyTipPageInfoBubbleViewBrowserTest
         NOTREACHED();
         break;
     }
+    EXPECT_EQ(page_info->GetSecurityDescriptionType(),
+              PageInfoUI::SecurityDescriptionType::SAFETY_TIP);
   }
 
   void CheckPageInfoDoesNotShowSafetyTipInfo(Browser* browser) {
     OpenPageInfoBubble(browser);
-    views::BubbleDialogDelegateView* page_info =
-        PageInfoBubbleViewBase::GetPageInfoBubbleForTesting();
+    auto* page_info = static_cast<PageInfoBubbleViewBase*>(
+        PageInfoBubbleViewBase::GetPageInfoBubbleForTesting());
     ASSERT_TRUE(page_info);
     EXPECT_NE(page_info->GetWindowTitle(),
               l10n_util::GetStringUTF16(
                   IDS_PAGE_INFO_SAFETY_TIP_BAD_REPUTATION_TITLE));
+    EXPECT_NE(page_info->GetSecurityDescriptionType(),
+              PageInfoUI::SecurityDescriptionType::SAFETY_TIP);
   }
 
  private: