Merge 106270 - Check for default content settings when requiring user authorization for plug-ins.

chrome/browser/tab_contents/tab_contents_ssl_helper.cc

 // Copyright (c) 2011 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/tab_contents/tab_contents_ssl_helper.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 195 matching lines @@
 void TabContentsSSLHelper::SelectClientCertificate(
     scoped_refptr<SSLClientAuthHandler> handler) {
   net::SSLCertRequestInfo* cert_request_info = handler->cert_request_info();
   GURL requesting_url("https://" + cert_request_info->host_and_port);
   DCHECK(requesting_url.is_valid()) << "Invalid URL string: https://"
                                     << cert_request_info->host_and_port;
 
   HostContentSettingsMap* map =
       tab_contents_->profile()->GetHostContentSettingsMap();
   scoped_ptr<Value> filter(map->GetContentSettingValue(
-      requesting_url,
-      requesting_url,
+      requesting_url, requesting_url,
       CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
-      std::string()));
+      std::string(),
+      NULL, NULL));
 
   scoped_refptr<net::X509Certificate> selected_cert;
   if (filter.get()) {
     // Try to automatically select a client certificate.
-    DCHECK(filter->IsType(Value::TYPE_DICTIONARY));
-    DictionaryValue* filter_dict = static_cast<DictionaryValue*>(filter.get());
+    if (filter->IsType(Value::TYPE_DICTIONARY)) {
+      DictionaryValue* filter_dict =
+          static_cast<DictionaryValue*>(filter.get());
 
-    const std::vector<scoped_refptr<net::X509Certificate> >& all_client_certs =
-        cert_request_info->client_certs;
-    for (size_t i = 0; i < all_client_certs.size(); ++i) {
-      if (CertMatchesFilter(*all_client_certs[i], *filter_dict)) {
-        selected_cert = all_client_certs[i];
-        // Use the first certificate that is matched by the filter.
-        break;
+      const std::vector<scoped_refptr<net::X509Certificate> >&
+          all_client_certs = cert_request_info->client_certs;
+      for (size_t i = 0; i < all_client_certs.size(); ++i) {
+        if (CertMatchesFilter(*all_client_certs[i], *filter_dict)) {
+          selected_cert = all_client_certs[i];
+          // Use the first certificate that is matched by the filter.
+          break;
+        }
       }
+    } else {
+      NOTREACHED();
     }
   }
 
   if (selected_cert) {
     handler->CertificateSelected(selected_cert);
   } else {
     ShowClientCertificateRequestDialog(handler);
   }
 }
 
@@ skipping 50 matching lines @@
 TabContentsSSLHelper::SSLAddCertData* TabContentsSSLHelper::GetAddCertData(
     SSLAddCertHandler* handler) {
   // Find/create the slot.
   linked_ptr<SSLAddCertData>& ptr_ref =
       request_id_to_add_cert_data_[handler->network_request_id()];
   // Fill it if necessary.
   if (!ptr_ref.get())
     ptr_ref.reset(new SSLAddCertData(tab_contents_));
   return ptr_ref.get();
 }