SSLCertRequestInfo: Add |valid_cas| and |valid_key_types|

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 1270 matching lines @@
   if (!tab) {
     NOTREACHED();
     return;
   }
 
   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;
 
   Profile* profile = Profile::FromBrowserContext(tab->GetBrowserContext());
-  scoped_ptr<Value> filter(
-      profile->GetHostContentSettingsMap()->GetWebsiteSetting(
-          requesting_url,
-          requesting_url,
-          CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
-          std::string(), NULL));
+  if (!cert_request_info->no_client_certs) {
+    scoped_ptr<Value> filter(
+        profile->GetHostContentSettingsMap()->GetWebsiteSetting(
+            requesting_url,
+            requesting_url,
+            CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
+            std::string(), NULL));
 
-  if (filter.get()) {
-    // Try to automatically select a client certificate.
-    if (filter->IsType(Value::TYPE_DICTIONARY)) {
-      DictionaryValue* filter_dict =
-          static_cast<DictionaryValue*>(filter.get());
+    if (filter.get()) {
+      // Try to automatically select a client certificate.
+      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)) {
-          // Use the first certificate that is matched by the filter.
-          callback.Run(all_client_certs[i]);
-          return;
+        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)) {
+            // Use the first certificate that is matched by the filter.
+            callback.Run(all_client_certs[i]);
+            return;
+          }
         }
+      } else {
+        NOTREACHED();
       }
-    } else {
-      NOTREACHED();
     }
   }
 
   SSLTabHelper* ssl_tab_helper = SSLTabHelper::FromWebContents(tab);
   if (!ssl_tab_helper) {
     // If there is no SSLTabHelper for the given WebContents then we can't
     // show the user a dialog to select a client certificate. So we simply
     // proceed with no client certificate.
     callback.Run(NULL);
     return;
@@ skipping 605 matching lines @@
     io_thread_application_locale_ = locale;
 }
 
 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
     const std::string& locale) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   io_thread_application_locale_ = locale;
 }
 
 }  // namespace chrome