- Add a new content settings type AUTO-SELECT-CERTIFICATE. The default value of the new content settings type AUTO-SELECT-CERTIFICATE is CONTENT_SETTING_ASK

- Add a policy for whitelisting origins for which client certificates should be auto selected.
- Add a policy to set a default setting for the auto select certificates setting.


BUG=81825
TEST=host_content_settings_map_unittest.cc,
          content_settings_policy_provider_unit_test.cc,
          configuration_policy_pref_store_unittest.cc 


Review URL: http://codereview.chromium.org/7537025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98026 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 5 deletions

diff --git a/content/browser/ssl/ssl_client_auth_handler.h b/content/browser/ssl/ssl_client_auth_handler.h
index 4dbcaa7..4657c84 100644
--- a/content/browser/ssl/ssl_client_auth_handler.h
+++ b/content/browser/ssl/ssl_client_auth_handler.h
@@ -29,8 +29,7 @@ class SSLClientAuthHandler
   SSLClientAuthHandler(net::URLRequest* request,
                        net::SSLCertRequestInfo* cert_request_info);
 
-  // Asks the user to select a certificate and resumes the URL request with that
-  // certificate.
+  // Selects a certificate and resumes the URL request with that certificate.
   // Should only be called on the IO thread.
   void SelectCertificate();
 
@@ -62,9 +61,9 @@ class SSLClientAuthHandler
   // Called on the IO thread.
   void DoCertificateSelected(net::X509Certificate* cert);
 
-  // Calls the SSL helper on the UI thread.
-  void ShowClientCertificateRequestDialog(int render_process_host_id,
-                                          int render_view_host_id);
+  // Selects a client certificate on the UI thread.
+  void DoSelectCertificate(int render_process_host_id,
+                           int render_view_host_id);
 
   // The net::URLRequest that triggered this client auth.
   net::URLRequest* request_;