Add Content API around CertStore.

chrome/browser/page_info_model.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/page_info_model.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/page_info_model_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
-#include "content/browser/cert_store.h"
+#include "content/public/browser/cert_store.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 "grit/theme_resources.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/ssl_cipher_suite_names.h"
 #include "net/base/ssl_connection_status_flags.h"
 #include "net/base/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 26 matching lines @@
   // Identity section.
   string16 subject_name(UTF8ToUTF16(url.host()));
   bool empty_subject_name = false;
   if (subject_name.empty()) {
     subject_name.assign(
         l10n_util::GetStringUTF16(IDS_PAGE_INFO_SECURITY_TAB_UNKNOWN_PARTY));
     empty_subject_name = true;
   }
 
   if (ssl.cert_id &&
-      CertStore::GetInstance()->RetrieveCert(ssl.cert_id, &cert) &&
+      content::CertStore::GetInstance()->RetrieveCert(ssl.cert_id, &cert) &&
       (!net::IsCertStatusError(ssl.cert_status) ||
        net::IsCertStatusMinorError(ssl.cert_status))) {
     // There are no major errors. Check for minor errors.
     if (net::IsCertStatusMinorError(ssl.cert_status)) {
       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(
@@ skipping 284 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));
 }