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

trunk/src/net/url_request/url_request.cc

Index: trunk/src/net/url_request/url_request.cc
===================================================================
--- trunk/src/net/url_request/url_request.cc	(revision 224274)
+++ trunk/src/net/url_request/url_request.cc	(working copy)
@@ -919,25 +919,20 @@
 
 bool URLRequest::GetHSTSRedirect(GURL* redirect_url) const {
   const GURL& url = this->url();
-  if (redirect_url && !url.SchemeIs("http"))
+  if (!url.SchemeIs("http"))
     return false;
   TransportSecurityState::DomainState domain_state;
-  bool allow_dynamic_state =
-      !(load_flags_ & LOAD_DO_NOT_SEND_COOKIES) && CanGetCookies(CookieList());
   if (context()->transport_security_state() &&
       context()->transport_security_state()->GetDomainState(
           url.host(),
           SSLConfigService::IsSNIAvailable(context()->ssl_config_service()),
-          allow_dynamic_state,
           &domain_state) &&
       domain_state.ShouldUpgradeToSSL()) {
-    if (redirect_url) {
-      url_canon::Replacements<char> replacements;
-      const char kNewScheme[] = "https";
-      replacements.SetScheme(kNewScheme,
-                             url_parse::Component(0, strlen(kNewScheme)));
-      *redirect_url = url.ReplaceComponents(replacements);
-    }
+    url_canon::Replacements<char> replacements;
+    const char kNewScheme[] = "https";
+    replacements.SetScheme(kNewScheme,
+                           url_parse::Component(0, strlen(kNewScheme)));
+    *redirect_url = url.ReplaceComponents(replacements);
     return true;
   }
   return false;