Add a method to the HostContentSettings map to return the |Value| of a content setting

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 "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "base/values.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/ssl_add_cert_handler.h"
 #include "chrome/browser/ssl_client_certificate_selector.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/tab_contents/infobar.h"
 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/content_settings.h"
 #include "content/browser/ssl/ssl_client_auth_handler.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/net_errors.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
@@ skipping 153 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();
-  ContentSetting setting = map->GetContentSetting(
+  scoped_ptr<Value> cert_filter(map->GetContentSettingValue(
       requesting_url,
       requesting_url,
       CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
-      std::string());
-  DCHECK_NE(setting, CONTENT_SETTING_DEFAULT);
+      std::string()));
 
   // TODO(markusheintz): Implement filter for matching specific certificate
   // criteria.
-  bool cert_matches_filter = true;
-
-  if (setting == CONTENT_SETTING_ALLOW &&
-      cert_request_info->client_certs.size() == 1 &&
-      cert_matches_filter) {
+  // A non NULL |cert_filter| is equvivalent to "allow certificate-auto-submit".
+  // If NULL is returned then the dialog to select a client certificate is
+  // displayed.
+  if (cert_filter.get() &&
+      cert_request_info->client_certs.size() == 1) {
     net::X509Certificate* cert = cert_request_info->client_certs[0].get();
     handler->CertificateSelected(cert);
   } else {
     ShowClientCertificateRequestDialog(handler);
   }
 }
 
 void TabContentsSSLHelper::ShowClientCertificateRequestDialog(
     scoped_refptr<SSLClientAuthHandler> handler) {
   browser::ShowSSLClientCertificateSelector(
@@ skipping 44 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();
 }