Handle about:blank in the Origin Info Bubble better.

chrome/browser/ui/website_settings/website_settings.cc

Index: chrome/browser/ui/website_settings/website_settings.cc
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index 09ec5bada76ba7d4d3f7553108637877940662ea..a842ba37c39a71672af3e620975410b3a38413df 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -363,14 +363,6 @@ void WebsiteSettings::Init(
   if (url.SchemeIs(url::kAboutScheme)) {
     // All about: URLs except about:blank are redirected.
     DCHECK_EQ(url::kAboutBlankURL, url.spec());
-    site_identity_status_ = SITE_IDENTITY_STATUS_NO_CERT;
-    site_identity_details_ =
-        l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_INSECURE_IDENTITY);
-    site_connection_status_ = SITE_CONNECTION_STATUS_UNENCRYPTED;
-    site_connection_details_ = l10n_util::GetStringFUTF16(
-        IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT,
-        UTF8ToUTF16(url.spec()));
-    return;
   }
 
   if (url.SchemeIs(content::kChromeUIScheme) || isChromeUINativeScheme) {
@@ -395,7 +387,7 @@ void WebsiteSettings::Init(
         SecurityStateModel::SECURITY_POLICY_WARNING) {
       site_identity_status_ = SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT;
       site_identity_details_ = l10n_util::GetStringFUTF16(
-          IDS_CERT_POLICY_PROVIDED_CERT_MESSAGE, UTF8ToUTF16(url.host()));
+          IDS_CERT_POLICY_PROVIDED_CERT_MESSAGE, UTF8ToUTF16(site_url_.host()));
     } else if (net::IsCertStatusMinorError(security_info.cert_status)) {
       site_identity_status_ = SITE_IDENTITY_STATUS_CERT_REVOCATION_UNKNOWN;
       base::string16 issuer_name(UTF8ToUTF16(cert->issuer().GetDisplayName()));
@@ -501,7 +493,7 @@ void WebsiteSettings::Init(
     const base::string16 bullet = UTF8ToUTF16("\n • ");
     std::vector<ssl_errors::ErrorInfo> errors;
     ssl_errors::ErrorInfo::GetErrorsForCertStatus(
-        cert, security_info.cert_status, url, &errors);
+        cert, security_info.cert_status, site_url_, &errors);
     for (size_t i = 0; i < errors.size(); ++i) {
       site_identity_details_ += bullet;
       site_identity_details_ += errors[i].short_description();
@@ -633,7 +625,8 @@ void WebsiteSettings::Init(
   DCHECK(delegate);
   // Only show an SSL decision revoke button if the user has chosen to bypass
   // SSL host errors for this host in the past.
-  show_ssl_decision_revoke_button_ = delegate->HasAllowException(url.host());
+  show_ssl_decision_revoke_button_ =
+      delegate->HasAllowException(site_url_.host());
 
   // By default select the Permissions Tab that displays all the site
   // permissions. In case of a connection error or an issue with the certificate