Make generateReferrerHeader() return a Referrer instead of a String

Source/platform/weborigin/SecurityPolicy.cpp

 /*
  * Copyright (C) 2011 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.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 47 matching lines @@
         return true;
 
     if (!referrerIsSecureURL)
         return false;
 
     bool URLIsSecureURL = url.protocolIs("https");
 
     return !URLIsSecureURL;
 }
 
-String SecurityPolicy::generateReferrerHeader(ReferrerPolicy referrerPolicy, const KURL& url, const String& referrer)
+Referrer SecurityPolicy::generateReferrerHeader(ReferrerPolicy referrerPolicy, const KURL& url, const String& referrer)
 {
     if (referrer.isEmpty())
-        return String();
+        return Referrer(String(), referrerPolicy);
 
     if (!(protocolIs(referrer, "https") || protocolIs(referrer, "http")))
-        return String();
+        return Referrer(String(), referrerPolicy);
 
     switch (referrerPolicy) {
     case ReferrerPolicyNever:
-        return String();
+        return Referrer(String(), referrerPolicy);
     case ReferrerPolicyAlways:
-        return referrer;
+        return Referrer(referrer, referrerPolicy);
     case ReferrerPolicyOrigin: {
         String origin = SecurityOrigin::createFromString(referrer)->toString();
         if (origin == "null")
-            return String();
+            return Referrer(String(), referrerPolicy);
         // A security origin is not a canonical URL as it lacks a path. Add /
         // to turn it into a canonical URL we can use as referrer.
-        return origin + "/";
+        return Referrer(origin + "/", referrerPolicy);
     }
     case ReferrerPolicyDefault:
         break;
     }
 
-    return shouldHideReferrer(url, referrer) ? String() : referrer;
+    return Referrer(shouldHideReferrer(url, referrer) ? String() : referrer, referrerPolicy);
 }
 
 bool SecurityPolicy::isAccessWhiteListed(const SecurityOrigin* activeOrigin, const SecurityOrigin* targetOrigin)
 {
     if (OriginAccessWhiteList* list = originAccessMap().get(activeOrigin->toString())) {
         for (size_t i = 0; i < list->size();  ++i) {
             if (list->at(i).matchesOrigin(*targetOrigin) != OriginAccessEntry::DoesNotMatchOrigin)
                 return true;
         }
     }
@@ skipping 46 matching lines @@
         map.remove(it);
 }
 
 void SecurityPolicy::resetOriginAccessWhitelists()
 {
     ASSERT(isMainThread());
     originAccessMap().clear();
 }
 
 } // namespace blink