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

trunk/src/net/socket_stream/socket_stream.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.
 //
 // TODO(ukai): code is similar with http_network_transaction.cc.  We should
 //   think about ways to share code, if possible.
 
 #include "net/socket_stream/socket_stream.h"
 
 #include <set>
@@ skipping 114 matching lines @@
 }
 
 void SocketStream::SetUserData(const void* key, UserData* data) {
   user_data_[key] = linked_ptr<UserData>(data);
 }
 
 bool SocketStream::is_secure() const {
   return url_.SchemeIs("wss");
 }
 
-GURL SocketStream::GetURLForCookies(const GURL& url) {
-  std::string scheme = url.SchemeIs("wss") ? "https" : "http";
-  url_canon::Replacements<char> replacements;
-  replacements.SetScheme(scheme.c_str(),
-                         url_parse::Component(0, scheme.length()));
-  return url.ReplaceComponents(replacements);
-}
-
 void SocketStream::set_context(URLRequestContext* context) {
   const URLRequestContext* prev_context = context_;
 
   context_ = context;
 
   if (prev_context != context) {
     if (prev_context && pac_request_) {
       prev_context->proxy_service()->CancelPacRequest(pac_request_);
       pac_request_ = NULL;
     }
@@ skipping 1175 matching lines @@
       return OK;
   }
 
   if (!delegate_)
     return result;
 
   SSLInfo ssl_info;
   ssl_socket->GetSSLInfo(&ssl_info);
 
   TransportSecurityState::DomainState domain_state;
-  const bool fatal =
-      context_->transport_security_state() &&
-      context_->transport_security_state()->GetDomainState(
-          url_.host(),
+  const bool fatal = context_->transport_security_state() &&
+      context_->transport_security_state()->GetDomainState(url_.host(),
           SSLConfigService::IsSNIAvailable(context_->ssl_config_service()),
-          delegate_->CanGetCookies(this, url_for_cookies()),
           &domain_state) &&
       domain_state.ShouldSSLErrorsBeFatal();
 
   delegate_->OnSSLCertificateError(this, ssl_info, fatal);
   return ERR_IO_PENDING;
 }
 
 }  // namespace net