Revert "Add button to page info to revoke user certificate decisions."

chrome/browser/ui/website_settings/website_settings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/website_settings/website_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
-#include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browsing_data/browsing_data_channel_id_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
-#include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/ui/website_settings/website_settings_infobar_delegate.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_pattern.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/ssl_status.h"
 #include "content/public/common/url_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
@@ skipping 72 matching lines @@
 WebsiteSettings::SiteIdentityStatus GetSiteIdentityStatusByCTInfo(
     const content::SignedCertificateTimestampIDStatusList& scts,
     bool is_ev) {
   if (CertificateTransparencyStatusMatch(scts, net::ct::SCT_STATUS_INVALID))
     return WebsiteSettings::SITE_IDENTITY_STATUS_ERROR;
 
   return is_ev ? WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT
                : WebsiteSettings::SITE_IDENTITY_STATUS_CERT;
 }
 
-const char kRememberCertificateErrorDecisionsFieldTrialName[] =
-    "RememberCertificateErrorDecisions";
-const char kRememberCertificateErrorDecisionsFieldTrialDefaultGroup[] =
-    "Default";
-const char kRememberCertificateErrorDecisionsFieldTrialDisableGroup[] =
-    "Disable";
-// Returns true if the user is in the experimental group or has the flag enabled
-// for remembering SSL error decisions, otherwise false.
-//
-// TODO(jww): The field trial is scheduled to end 2015/02/28. This should be
-// removed at that point unless the field trial or flag continues.
-bool InRememberCertificateErrorDecisionsGroup() {
-  std::string group_name = base::FieldTrialList::FindFullName(
-      kRememberCertificateErrorDecisionsFieldTrialName);
-
-  // The Default and Disable groups are the "old-style" forget-at-session
-  // restart groups, so they do not get the button.
-  bool in_experimental_group = !group_name.empty() &&
-      group_name.compare(
-          kRememberCertificateErrorDecisionsFieldTrialDefaultGroup) != 0 &&
-      group_name.compare(
-          kRememberCertificateErrorDecisionsFieldTrialDisableGroup) != 0;
-  bool has_command_line_switch = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kRememberCertErrorDecisions);
-  return in_experimental_group || has_command_line_switch;
-}
-
 }  // namespace
 
 WebsiteSettings::WebsiteSettings(
     WebsiteSettingsUI* ui,
     Profile* profile,
     TabSpecificContentSettings* tab_specific_content_settings,
     InfoBarService* infobar_service,
     const GURL& url,
     const content::SSLStatus& ssl,
     content::CertStore* cert_store)
     : TabSpecificContentSettings::SiteDataObserver(
           tab_specific_content_settings),
       ui_(ui),
       infobar_service_(infobar_service),
       show_info_bar_(false),
       site_url_(url),
       site_identity_status_(SITE_IDENTITY_STATUS_UNKNOWN),
       cert_id_(0),
       site_connection_status_(SITE_CONNECTION_STATUS_UNKNOWN),
       cert_store_(cert_store),
-      content_settings_(profile->GetHostContentSettingsMap()),
-      chrome_ssl_host_state_delegate_(
-          ChromeSSLHostStateDelegateFactory::GetForProfile(profile)) {
+      content_settings_(profile->GetHostContentSettingsMap()) {
   Init(profile, url, ssl);
 
   HistoryService* history_service = HistoryServiceFactory::GetForProfile(
       profile, Profile::EXPLICIT_ACCESS);
   if (history_service) {
     history_service->GetVisibleVisitCountToHost(
         site_url_,
         base::Bind(&WebsiteSettings::OnGotVisitCountToHost,
                    base::Unretained(this)),
         &visit_count_task_tracker_);
@@ skipping 370 matching lines @@
       site_connection_details_ += l10n_util::GetStringUTF16(
           IDS_PAGE_INFO_SECURITY_TAB_FALLBACK_MESSAGE);
     }
     if (no_renegotiation) {
       site_connection_details_ += ASCIIToUTF16("\n\n");
       site_connection_details_ += l10n_util::GetStringUTF16(
           IDS_PAGE_INFO_SECURITY_TAB_RENEGOTIATION_MESSAGE);
     }
   }
 
-  // Check if a user decision has been made to allow or deny certificates with
-  // errors on this site.
-  ChromeSSLHostStateDelegate* delegate =
-      ChromeSSLHostStateDelegateFactory::GetForProfile(profile);
-  DCHECK(delegate);
-  // Only show an SSL decision revoke button if both the user has chosen to
-  // bypass SSL host errors for this host in the past and the user is not using
-  // the traditional "forget-at-session-restart" error decision memory.
-  show_ssl_decision_revoke_button_ = delegate->HasUserDecision(url.host()) &&
-      InRememberCertificateErrorDecisionsGroup();
-
   // By default select the permissions tab that displays all the site
   // permissions. In case of a connection error or an issue with the
   // certificate presented by the website, select the connection tab to draw
   // the user's attention to the issue. If the site does not provide a
   // certificate because it was loaded over an unencrypted connection, don't
   // select the connection tab.
   WebsiteSettingsUI::TabId tab_id = WebsiteSettingsUI::TAB_ID_PERMISSIONS;
   if (site_connection_status_ == SITE_CONNECTION_STATUS_ENCRYPTED_ERROR ||
       site_connection_status_ == SITE_CONNECTION_STATUS_MIXED_CONTENT ||
       site_identity_status_ == SITE_IDENTITY_STATUS_ERROR ||
@@ skipping 113 matching lines @@
   info.connection_status = site_connection_status_;
   info.connection_status_description =
       UTF16ToUTF8(site_connection_details_);
   info.identity_status = site_identity_status_;
   info.identity_status_description =
       UTF16ToUTF8(site_identity_details_);
   info.cert_id = cert_id_;
   info.signed_certificate_timestamp_ids.assign(
       signed_certificate_timestamp_ids_.begin(),
       signed_certificate_timestamp_ids_.end());
-  info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
   ui_->SetIdentityInfo(info);
 }
 
 void WebsiteSettings::PresentHistoryInfo(base::Time first_visit) {
   if (first_visit == base::Time()) {
     ui_->SetFirstVisit(base::string16());
     return;
   }
 
   bool visited_before_today = false;
   base::Time today = base::Time::Now().LocalMidnight();
   base::Time first_visit_midnight = first_visit.LocalMidnight();
   visited_before_today = (first_visit_midnight < today);
 
   base::string16 first_visit_text;
   if (visited_before_today) {
     first_visit_text = l10n_util::GetStringFUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY,
         base::TimeFormatShortDate(first_visit));
   } else {
     first_visit_text = l10n_util::GetStringUTF16(
         IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY);
   }
   ui_->SetFirstVisit(first_visit_text);
 }