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

This reverts commit a9df5b29.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 706076 as the
culprit for failures in the build cycles as shown on:
https://analysis.chromium.org/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtL2E5ZGY1YjI5ZmEyMzliNzQ5N2VjMmQ1NTFlNWNmNDQ3MDMzMGRiNDUM

Sample Failed Build: https://ci.chromium.org/buildbot/chromium.memory/Linux%20CFI/15311

Sample Failed Step: browser_tests

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}


Change-Id: I017d2046e5fce908c8f86ea2b2726d88b590a3da
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1007497
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1864001
Cr-Commit-Position: refs/heads/master@{#706247}

chrome/browser/ui/page_info/page_info_ui.cc

@@ -186,14 +186,12 @@ base::span<const PermissionsUIInfo> GetContentSettingsUIInfo() {
 std::unique_ptr<PageInfoUI::SecurityDescription> CreateSecurityDescription(
     PageInfoUI::SecuritySummaryColor style,
     int summary_id,
-    int details_id,
-    PageInfoUI::SecurityDescriptionType type) {
+    int details_id) {
   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;
 }
 
@@ -257,18 +255,15 @@ 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,
-                                       SecurityDescriptionType::SAFE_BROWSING);
+                                       IDS_PAGE_INFO_MALWARE_DETAILS);
     case PageInfo::SAFE_BROWSING_STATUS_SOCIAL_ENGINEERING:
-      return CreateSecurityDescription(SecuritySummaryColor::RED,
-                                       IDS_PAGE_INFO_SOCIAL_ENGINEERING_SUMMARY,
-                                       IDS_PAGE_INFO_SOCIAL_ENGINEERING_DETAILS,
-                                       SecurityDescriptionType::SAFE_BROWSING);
+      return CreateSecurityDescription(
+          SecuritySummaryColor::RED, IDS_PAGE_INFO_SOCIAL_ENGINEERING_SUMMARY,
+          IDS_PAGE_INFO_SOCIAL_ENGINEERING_DETAILS);
     case PageInfo::SAFE_BROWSING_STATUS_UNWANTED_SOFTWARE:
       return CreateSecurityDescription(SecuritySummaryColor::RED,
                                        IDS_PAGE_INFO_UNWANTED_SOFTWARE_SUMMARY,
-                                       IDS_PAGE_INFO_UNWANTED_SOFTWARE_DETAILS,
-                                       SecurityDescriptionType::SAFE_BROWSING);
+                                       IDS_PAGE_INFO_UNWANTED_SOFTWARE_DETAILS);
     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:
@@ -281,8 +276,7 @@ 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,
-                                       SecurityDescriptionType::SAFE_BROWSING);
+                                       IDS_PAGE_INFO_BILLING_DETAILS);
   }
 
   switch (identity_info.safety_tip_status) {
@@ -290,8 +284,7 @@ PageInfoUI::GetSecurityDescription(const IdentityInfo& identity_info) const {
       return CreateSecurityDescription(
           SecuritySummaryColor::RED,
           IDS_PAGE_INFO_SAFETY_TIP_BAD_REPUTATION_TITLE,
-          IDS_PAGE_INFO_SAFETY_TIP_BAD_REPUTATION_DESCRIPTION,
-          SecurityDescriptionType::SAFETY_TIP);
+          IDS_PAGE_INFO_SAFETY_TIP_BAD_REPUTATION_DESCRIPTION);
     case security_state::SafetyTipStatus::kLookalike:
       // Lookalikes have their own strings, but they're suggestions, not
       // warnings, so we leave Page Info alone.
@@ -308,9 +301,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, SecurityDescriptionType::INTERNAL);
+      return CreateSecurityDescription(SecuritySummaryColor::GREEN,
+                                       IDS_PAGE_INFO_INTERNAL_PAGE,
+                                       IDS_PAGE_INFO_INTERNAL_PAGE);
 #else
       // Internal pages on desktop have their own UI implementations which
       // should never call this function.
@@ -326,28 +319,23 @@ 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,
-                                           SecurityDescriptionType::CONNECTION);
+                                           IDS_PAGE_INFO_NOT_SECURE_DETAILS);
         case PageInfo::SITE_CONNECTION_STATUS_INSECURE_FORM_ACTION:
           return CreateSecurityDescription(SecuritySummaryColor::RED,
                                            IDS_PAGE_INFO_MIXED_CONTENT_SUMMARY,
-                                           IDS_PAGE_INFO_NOT_SECURE_DETAILS,
-                                           SecurityDescriptionType::CONNECTION);
+                                           IDS_PAGE_INFO_NOT_SECURE_DETAILS);
         case PageInfo::SITE_CONNECTION_STATUS_INSECURE_PASSIVE_SUBRESOURCE:
           return CreateSecurityDescription(SecuritySummaryColor::RED,
                                            IDS_PAGE_INFO_MIXED_CONTENT_SUMMARY,
-                                           IDS_PAGE_INFO_MIXED_CONTENT_DETAILS,
-                                           SecurityDescriptionType::CONNECTION);
+                                           IDS_PAGE_INFO_MIXED_CONTENT_DETAILS);
         case PageInfo::SITE_CONNECTION_STATUS_LEGACY_TLS:
           return CreateSecurityDescription(SecuritySummaryColor::RED,
                                            IDS_PAGE_INFO_MIXED_CONTENT_SUMMARY,
-                                           IDS_PAGE_INFO_LEGACY_TLS_DETAILS,
-                                           SecurityDescriptionType::CONNECTION);
+                                           IDS_PAGE_INFO_LEGACY_TLS_DETAILS);
         default:
           return CreateSecurityDescription(SecuritySummaryColor::GREEN,
                                            IDS_PAGE_INFO_SECURE_SUMMARY,
-                                           IDS_PAGE_INFO_SECURE_DETAILS,
-                                           SecurityDescriptionType::CONNECTION);
+                                           IDS_PAGE_INFO_SECURE_DETAILS);
       }
     case PageInfo::SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM:
     case PageInfo::SITE_IDENTITY_STATUS_UNKNOWN:
@@ -355,8 +343,7 @@ PageInfoUI::GetSecurityDescription(const IdentityInfo& identity_info) const {
     default:
       return CreateSecurityDescription(SecuritySummaryColor::RED,
                                        IDS_PAGE_INFO_NOT_SECURE_SUMMARY,
-                                       IDS_PAGE_INFO_NOT_SECURE_DETAILS,
-                                       SecurityDescriptionType::CONNECTION);
+                                       IDS_PAGE_INFO_NOT_SECURE_DETAILS);
   }
 }
 

chrome/browser/ui/page_info/page_info_ui.h

@@ -43,19 +43,6 @@ 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.
@@ -65,9 +52,6 @@ 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,7 +116,6 @@ 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,7 +20,6 @@
 #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"
@@ -735,8 +734,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(*security_description);
   GetBubbleFrameView()->UpdateWindowTitle();
   int text_style = views::style::STYLE_PRIMARY;
   switch (security_description->summary_style) {
@@ -927,7 +926,6 @@ 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
@@ -987,16 +985,12 @@ void PageInfoBubbleView::StyledLabelLinkClicked(views::StyledLabel* label,
                                                 int event_flags) {
   switch (label->GetID()) {
     case PageInfoBubbleView::VIEW_ID_PAGE_INFO_LABEL_SECURITY_DETAILS:
-      if (GetSecurityDetails().type == 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);
-      }
+      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,7 +6,6 @@
 
 #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"
@@ -72,11 +71,6 @@ void PageInfoBubbleViewBase::OnWidgetDestroying(views::Widget* widget) {
   g_page_info_bubble = nullptr;
 }
 
-PageInfoUI::SecurityDescription PageInfoBubbleViewBase::GetSecurityDetails()
-    const {
-  return security_description_;
-}
-
 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,7 +5,6 @@
 #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"
@@ -57,12 +56,7 @@ class PageInfoBubbleViewBase : public views::BubbleDialogDelegateView,
   bool ShouldShowCloseButton() const override;
   void OnWidgetDestroying(views::Widget* widget) override;
 
-  PageInfoUI::SecurityDescription GetSecurityDetails() const;
   void set_window_title(const base::string16& title) { window_title_ = title; }
-  void set_security_description(
-      const PageInfoUI::SecurityDescription& description) {
-    security_description_ = description;
-  }
 
  private:
   // WebContentsObserver:
@@ -72,7 +66,6 @@ class PageInfoBubbleViewBase : public views::BubbleDialogDelegateView,
   void DidChangeVisibleSecurityState() override;
 
   base::string16 window_title_;
-  PageInfoUI::SecurityDescription security_description_;
 
   DISALLOW_COPY_AND_ASSIGN(PageInfoBubbleViewBase);
 };

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

@@ -88,9 +88,6 @@ class PageInfoBubbleViewTestApi {
   views::Widget::ClosedReason closed_reason() const { return *closed_reason_; }
 
   base::string16 GetWindowTitle() { return view_->GetWindowTitle(); }
-  PageInfoUI::SecurityDescription GetSecurityDetails() {
-    return view_->GetSecurityDetails();
-  }
 
   PermissionSelectorRow* GetPermissionSelectorAt(int index) {
     return view_->selector_rows_[index].get();
@@ -685,8 +682,6 @@ 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_->GetSecurityDetails().type);
 
   // 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
@@ -705,8 +700,6 @@ TEST_F(PageInfoBubbleViewTest, OpenPageInfoBubbleAfterNavigationStart) {
   navigation->Commit();
   EXPECT_EQ(l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURE_SUMMARY),
             api_->GetWindowTitle());
-  EXPECT_EQ(PageInfoUI::SecurityDescriptionType::CONNECTION,
-            api_->GetSecurityDetails().type);
 }
 
 TEST_F(PageInfoBubbleViewTest, EnsureCloseCallback) {

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

@@ -232,26 +232,22 @@ class SafetyTipPageInfoBubbleViewBrowserTest
     }
 
     OpenPageInfoBubble(browser);
-    auto* page_info = static_cast<SafetyTipPageInfoBubbleView*>(
-        PageInfoBubbleViewBase::GetPageInfoBubbleForTesting());
+    views::BubbleDialogDelegateView* page_info =
+        PageInfoBubbleViewBase::GetPageInfoBubbleForTesting();
     ASSERT_TRUE(page_info);
     EXPECT_EQ(page_info->GetWindowTitle(),
               l10n_util::GetStringUTF16(
                   IDS_PAGE_INFO_SAFETY_TIP_BAD_REPUTATION_TITLE));
-    EXPECT_EQ(page_info->GetSecurityDetails().type,
-              PageInfoUI::SecurityDescriptionType::SAFETY_TIP);
   }
 
   void CheckPageInfoDoesNotShowSafetyTipInfo(Browser* browser) {
     OpenPageInfoBubble(browser);
-    auto* page_info = static_cast<SafetyTipPageInfoBubbleView*>(
-        PageInfoBubbleViewBase::GetPageInfoBubbleForTesting());
+    views::BubbleDialogDelegateView* page_info =
+        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->GetSecurityDetails().type,
-              PageInfoUI::SecurityDescriptionType::SAFETY_TIP);
   }
 
  private: