Revert 224269 "Don't persist HPKP if PrivacyMode is enabled."

trunk/src/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Index: trunk/src/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
===================================================================
--- trunk/src/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc	(revision 224274)
+++ trunk/src/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc	(working copy)
@@ -568,9 +568,18 @@
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
 
   if (request->url().SchemeIsSecure()) {
-    if (request->GetHSTSRedirect(NULL)) {
+    const net::URLRequestContext* context = request->context();
+    net::TransportSecurityState* state = context->transport_security_state();
+    if (state) {
+      net::TransportSecurityState::DomainState domain_state;
+      bool has_sni = net::SSLConfigService::IsSNIAvailable(
+          context->ssl_config_service());
+      if (state->GetDomainState(request->url().host(), has_sni,
+                                &domain_state) &&
+          domain_state.ShouldUpgradeToSSL()) {
         sender->Send(new ChromeViewMsg_AddStrictSecurityHost(
             info->GetRouteID(), request->url().host()));
+      }
     }
   }