Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3889)

Unified Diff: chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc

Issue 2327433002: Stop using CertStore which is not compatible with PlzNavigate. (Closed)
Patch Set: remove cert_store on ios Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc
diff --git a/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc
index dc2889dcea1bd15cd3ecfe3d8f76171085331487..84c10cc2f00d02764754da294f34c0f086cb78bb 100644
--- a/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc
+++ b/chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc
@@ -14,7 +14,6 @@
#include "components/google/core/browser/google_util.h"
#include "components/omnibox/browser/autocomplete_input.h"
#include "components/prefs/pref_service.h"
-#include "content/public/browser/cert_store.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/web_contents.h"
@@ -82,13 +81,10 @@ ChromeToolbarModelDelegate::GetSecurityLevel() const {
scoped_refptr<net::X509Certificate> ChromeToolbarModelDelegate::GetCertificate()
const {
- scoped_refptr<net::X509Certificate> cert;
content::NavigationEntry* entry = GetNavigationEntry();
- if (entry) {
- content::CertStore::GetInstance()->RetrieveCert(entry->GetSSL().cert_id,
- &cert);
- }
- return cert;
+ if (!entry)
+ return scoped_refptr<net::X509Certificate>();
+ return entry->GetSSL().certificate;
}
content::NavigationController*

Powered by Google App Engine
This is Rietveld 408576698