Omnibox M5 work, part 1: Security changes...

chrome/browser/cert_store.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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/cert_store.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/stl_util-inl.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
@@ skipping 69 matching lines @@
   return cert_id;
 }
 
 bool CertStore::RetrieveCert(int cert_id,
                              scoped_refptr<net::X509Certificate>* cert) {
   AutoLock autoLock(cert_lock_);
 
   CertMap::iterator iter = id_to_cert_.find(cert_id);
   if (iter == id_to_cert_.end())
     return false;
-  *cert = iter->second;
+  if (cert)
+    *cert = iter->second;
   return true;
 }
 
 void CertStore::RemoveCertInternal(int cert_id) {
   CertMap::iterator cert_iter = id_to_cert_.find(cert_id);
   DCHECK(cert_iter != id_to_cert_.end());
 
   ReverseCertMap::iterator id_iter = cert_to_id_.find(cert_iter->second);
   DCHECK(id_iter != cert_to_id_.end());
   cert_to_id_.erase(id_iter);
@@ skipping 31 matching lines @@
 
 void CertStore::Observe(NotificationType type,
                         const NotificationSource& source,
                         const NotificationDetails& details) {
   DCHECK(type == NotificationType::RENDERER_PROCESS_TERMINATED ||
          type == NotificationType::RENDERER_PROCESS_CLOSED);
   RenderProcessHost* rph = Source<RenderProcessHost>(source).ptr();
   DCHECK(rph);
   RemoveCertsForRenderProcesHost(rph->id());
 }