Move parsing of referrer policy header values to SecurityPolicy

third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009 Torch Mobile, Inc. http://www.torchmobile.com/
  * Copyright (C) 2010 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 308 matching lines @@
             m_srcsetAttributeValue);
         setUrlToLoad(bestFitSourceForImageAttributes(
                          m_mediaValues->devicePixelRatio(), m_sourceSize,
                          m_imgSrcUrl, m_srcsetImageCandidate),
                      AllowURLReplacement);
       }
     } else if (!m_referrerPolicySet &&
                match(attributeName, referrerpolicyAttr) &&
                !attributeValue.isNull()) {
       m_referrerPolicySet = true;
-      SecurityPolicy::referrerPolicyFromStringWithLegacyKeywords(
-          attributeValue, &m_referrerPolicy);
+      SecurityPolicy::referrerPolicyFromString(
+          attributeValue, SupportReferrerPolicyLegacyKeywords,
+          &m_referrerPolicy);
     }
   }
 
   template <typename NameType>
   void processLinkAttribute(const NameType& attributeName,
                             const String& attributeValue) {
     // FIXME - Don't set rel/media/crossorigin multiple times.
     if (match(attributeName, hrefAttr)) {
       setUrlToLoad(attributeValue, DisallowURLReplacement);
     } else if (match(attributeName, relAttr)) {
@@ skipping 11 matching lines @@
     } else if (match(attributeName, nonceAttr)) {
       setNonce(attributeValue);
     } else if (match(attributeName, asAttr)) {
       m_asAttributeValue = attributeValue.lower();
     } else if (match(attributeName, typeAttr)) {
       m_typeAttributeValue = attributeValue;
     } else if (!m_referrerPolicySet &&
                match(attributeName, referrerpolicyAttr) &&
                !attributeValue.isNull()) {
       m_referrerPolicySet = true;
-      SecurityPolicy::referrerPolicyFromString(attributeValue,
-                                               &m_referrerPolicy);
+      SecurityPolicy::referrerPolicyFromString(
+          attributeValue, DoNotSupportReferrerPolicyLegacyKeywords,
+          &m_referrerPolicy);
     }
   }
 
   template <typename NameType>
   void processInputAttribute(const NameType& attributeName,
                              const String& attributeValue) {
     // FIXME - Don't set type multiple times.
     if (match(attributeName, srcAttr))
       setUrlToLoad(attributeValue, DisallowURLReplacement);
     else if (match(attributeName, typeAttr))
@@ skipping 267 matching lines @@
       initialViewport, documentParameters->defaultViewportMinWidth);
   mediaValues->overrideViewportDimensions(constraints.layoutSize.width(),
                                           constraints.layoutSize.height());
 }
 
 static void handleMetaReferrer(const String& attributeValue,
                                CachedDocumentParameters* documentParameters,
                                CSSPreloadScanner* cssScanner) {
   ReferrerPolicy metaReferrerPolicy = ReferrerPolicyDefault;
   if (!attributeValue.isEmpty() && !attributeValue.isNull() &&
-      SecurityPolicy::referrerPolicyFromStringWithLegacyKeywords(
-          attributeValue, &metaReferrerPolicy)) {
+      SecurityPolicy::referrerPolicyFromString(
+          attributeValue, SupportReferrerPolicyLegacyKeywords,
+          &metaReferrerPolicy)) {
     documentParameters->referrerPolicy = metaReferrerPolicy;
   }
   cssScanner->setReferrerPolicy(documentParameters->referrerPolicy);
 }
 
 template <typename Token>
 static void handleMetaNameAttribute(
     const Token& token,
     CachedDocumentParameters* documentParameters,
     MediaValuesCached* mediaValues,
@@ skipping 259 matching lines @@
   defaultViewportMinWidth = document->viewportDefaultMinWidth();
   viewportMetaZeroValuesQuirk =
       document->settings() &&
       document->settings()->getViewportMetaZeroValuesQuirk();
   viewportMetaEnabled =
       document->settings() && document->settings()->getViewportMetaEnabled();
   referrerPolicy = document->getReferrerPolicy();
 }
 
 }  // namespace blink