Revert 102322 - For the SSL cert status, convert anonymous enum that gives bit values into a type...

chrome/browser/page_info_model.cc

 // Copyright (c) 2011 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/page_info_model.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 50 matching lines @@
   // warnings instead.
   static const int cert_warnings =
       net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION |
       net::CERT_STATUS_NO_REVOCATION_MECHANISM;
   int status_with_warnings_removed = ssl.cert_status() & ~cert_warnings;
 
   if (ssl.cert_id() &&
       CertStore::GetInstance()->RetrieveCert(ssl.cert_id(), &cert) &&
       !net::IsCertStatusError(status_with_warnings_removed)) {
     // No error found so far, check cert_status warnings.
-    net::CertStatus cert_status = ssl.cert_status();
+    int cert_status = ssl.cert_status();
     if (cert_status & cert_warnings) {
       string16 issuer_name(UTF8ToUTF16(cert->issuer().GetDisplayName()));
       if (issuer_name.empty()) {
         issuer_name.assign(l10n_util::GetStringUTF16(
             IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY));
       }
       description.assign(l10n_util::GetStringFUTF16(
           IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY, issuer_name));
 
       description += ASCIIToUTF16("\n\n");
       if (cert_status & net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION) {
         description += l10n_util::GetStringUTF16(
             IDS_PAGE_INFO_SECURITY_TAB_UNABLE_TO_CHECK_REVOCATION);
       } else if (cert_status & net::CERT_STATUS_NO_REVOCATION_MECHANISM) {
         description += l10n_util::GetStringUTF16(
             IDS_PAGE_INFO_SECURITY_TAB_NO_REVOCATION_MECHANISM);
       } else {
         NOTREACHED() << "Need to specify string for this warning";
       }
       icon_id = ICON_STATE_WARNING_MINOR;
-    } else if (ssl.cert_status() & net::CERT_STATUS_IS_EV) {
+    } else if ((ssl.cert_status() & net::CERT_STATUS_IS_EV) != 0) {
       // EV HTTPS page.
       DCHECK(!cert->subject().organization_names.empty());
       headline =
           l10n_util::GetStringFUTF16(IDS_PAGE_INFO_EV_IDENTITY_TITLE,
               UTF8ToUTF16(cert->subject().organization_names[0]),
               UTF8ToUTF16(url.host()));
       // An EV Cert is required to have a city (localityName) and country but
       // state is "if any".
       DCHECK(!cert->subject().locality_name.empty());
       DCHECK(!cert->subject().country_name.empty());
       string16 locality;
       if (!cert->subject().state_or_province_name.empty()) {
         locality = l10n_util::GetStringFUTF16(
             IDS_PAGEINFO_ADDRESS,
             UTF8ToUTF16(cert->subject().locality_name),
             UTF8ToUTF16(cert->subject().state_or_province_name),
             UTF8ToUTF16(cert->subject().country_name));
       } else {
         locality = l10n_util::GetStringFUTF16(
             IDS_PAGEINFO_PARTIAL_ADDRESS,
             UTF8ToUTF16(cert->subject().locality_name),
             UTF8ToUTF16(cert->subject().country_name));
       }
       DCHECK(!cert->subject().organization_names.empty());
       description.assign(l10n_util::GetStringFUTF16(
           IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV,
           UTF8ToUTF16(cert->subject().organization_names[0]),
           locality,
           UTF8ToUTF16(cert->issuer().GetDisplayName())));
-    } else if (ssl.cert_status() & net::CERT_STATUS_IS_DNSSEC) {
+    } else if ((ssl.cert_status() & net::CERT_STATUS_IS_DNSSEC) != 0) {
       // DNSSEC authenticated page.
       if (empty_subject_name)
         headline.clear();  // Don't display any title.
       else
         headline.assign(subject_name);
       description.assign(l10n_util::GetStringFUTF16(
           IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY, UTF8ToUTF16("DNSSEC")));
     } else {
       // Non-EV OK HTTPS page.
       if (empty_subject_name)
@@ skipping 218 matching lines @@
   // Loads the icons into the vector. The order must match the SectionStateIcon
   // enum.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_GOOD));
   icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_WARNING_MINOR));
   icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_WARNING_MAJOR));
   icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_BAD));
   icons_.push_back(&rb.GetNativeImageNamed(IDR_PAGEINFO_INFO));
   icons_.push_back(&rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_26));
 }