- 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, 3 insertions, 1 deletions

diff --git a/content/browser/mock_content_browser_client.h b/content/browser/mock_content_browser_client.h
index 50f57d3..9411910 100644
--- a/content/browser/mock_content_browser_client.h
+++ b/content/browser/mock_content_browser_client.h
@@ -6,6 +6,8 @@
 #define CONTENT_BROWSER_MOCK_CONTENT_BROWSER_CLIENT_H_
 #pragma once
 
+#include <string>
+
 #include "base/compiler_specific.h"
 #include "content/browser/content_browser_client.h"
 
@@ -61,7 +63,7 @@ class MockContentBrowserClient : public ContentBrowserClient {
       SSLCertErrorHandler* handler,
       bool overridable,
       Callback2<SSLCertErrorHandler*, bool>::Type* callback) OVERRIDE;
-  virtual void ShowClientCertificateRequestDialog(
+  virtual void SelectClientCertificate(
       int render_process_id,
       int render_view_id,
       SSLClientAuthHandler* handler) OVERRIDE;