Rename all methods accessing Singleton<T> as GetInstance().

chrome/browser/ui/toolbar/toolbar_model.cc

 // Copyright (c) 2010 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/ui/toolbar/toolbar_model.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/cert_store.h"
@@ skipping 70 matching lines @@
 
     case SECURITY_STYLE_AUTHENTICATED:
       if (ssl.displayed_insecure_content())
         return SECURITY_WARNING;
       if (net::IsCertStatusError(ssl.cert_status())) {
         DCHECK_EQ(ssl.cert_status() & net::CERT_STATUS_ALL_ERRORS,
                   net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION);
         return SECURITY_WARNING;
       }
       if ((ssl.cert_status() & net::CERT_STATUS_IS_EV) &&
-          CertStore::GetSharedInstance()->RetrieveCert(ssl.cert_id(), NULL))
+          CertStore::GetInstance()->RetrieveCert(ssl.cert_id(), NULL))
         return EV_SECURE;
       return SECURE;
 
     default:
       NOTREACHED();
       return NONE;
   }
 }
 
 int ToolbarModel::GetIcon() const {
   static int icon_ids[NUM_SECURITY_LEVELS] = {
     IDR_OMNIBOX_HTTP,
     IDR_OMNIBOX_HTTPS_VALID,
     IDR_OMNIBOX_HTTPS_VALID,
     IDR_OMNIBOX_HTTPS_WARNING,
     IDR_OMNIBOX_HTTPS_INVALID,
   };
   DCHECK(arraysize(icon_ids) == NUM_SECURITY_LEVELS);
   return icon_ids[GetSecurityLevel()];
 }
 
 std::wstring ToolbarModel::GetEVCertName() const {
   DCHECK_EQ(GetSecurityLevel(), EV_SECURE);
   scoped_refptr<net::X509Certificate> cert;
   // Note: Navigation controller and active entry are guaranteed non-NULL or
   // the security level would be NONE.
-  CertStore::GetSharedInstance()->RetrieveCert(
+  CertStore::GetInstance()->RetrieveCert(
       GetNavigationController()->GetActiveEntry()->ssl().cert_id(), &cert);
   return SSLManager::GetEVCertName(*cert);
 }
 
 NavigationController* ToolbarModel::GetNavigationController() const {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }