diff options
author | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 08:18:55 +0000 |
---|---|---|
committer | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 08:18:55 +0000 |
commit | 8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a (patch) | |
tree | a7425d106d83f1f031516e18ea9600363341fdb8 /chrome/browser/ssl | |
parent | 1bc1c69f95dab2c34232a5c8793cf9db51af2386 (diff) | |
download | chromium_src-8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a.zip chromium_src-8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a.tar.gz chromium_src-8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a.tar.bz2 |
Rename all methods accessing Singleton<T> as GetInstance().
This is in preparation to a subsequent CL where Singleton<T> will restrict access to only the type being made singleton.
I also moved pepper::ResourceTracker to a lazy instance since there were too many places in code where this class was being accessed from and this was a smaller change than renaming methods in that case.
BUG=65298
TEST=all existing tests should pass.
Review URL: http://codereview.chromium.org/5685007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
-rw-r--r-- | chrome/browser/ssl/ssl_blocking_page.cc | 2 | ||||
-rw-r--r-- | chrome/browser/ssl/ssl_error_info.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index 45bca07..b2bf6a1 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -103,7 +103,7 @@ std::string SSLBlockingPage::GetHTMLContents() { void SSLBlockingPage::UpdateEntry(NavigationEntry* entry) { const net::SSLInfo& ssl_info = handler_->ssl_info(); - int cert_id = CertStore::GetSharedInstance()->StoreCert( + int cert_id = CertStore::GetInstance()->StoreCert( ssl_info.cert, tab()->render_view_host()->process()->id()); entry->ssl().set_security_style(SECURITY_STYLE_AUTHENTICATION_BROKEN); diff --git a/chrome/browser/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc index 674a64b..b10e212 100644 --- a/chrome/browser/ssl/ssl_error_info.cc +++ b/chrome/browser/ssl/ssl_error_info.cc @@ -253,7 +253,7 @@ int SSLErrorInfo::GetErrorsForCertStatus(int cert_id, if (cert_status & kErrorFlags[i]) { count++; if (!cert.get()) { - bool r = CertStore::GetSharedInstance()->RetrieveCert(cert_id, &cert); + bool r = CertStore::GetInstance()->RetrieveCert(cert_id, &cert); DCHECK(r); } if (errors) |