Code review comments and upstream merge conflicts

Incorporated code review comments in components/net/http_loader.rs
Resolved merge conflicts in cargo.lock file. Updated ReferrerPolicy in
lib.rs

components/msg/constellation_msg.rs

@@ -305,17 +305,3 @@ pub enum FrameType {
     IFrame,
     MozBrowserIFrame,
 }
-
-/// [Policies](https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-states)
-/// for providing a referrer header for a request
-#[derive(Clone, Copy, Debug, Deserialize, HeapSizeOf, Serialize)]
-pub enum ReferrerPolicy {
-    NoReferrer,
-    NoReferrerWhenDowngrade,
-    Origin,
-    SameOrigin,
-    OriginWhenCrossOrigin,
-    UnsafeUrl,
-    StrictOrigin,
-    StrictOriginWhenCrossOrigin
-}

components/net/http_loader.rs

@@ -447,15 +447,11 @@ fn strict_origin(referrer_url: Url, url: Url) -> Option<Url> {
 
 /// https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin
 fn strict_origin_when_cross_origin(referrer_url: Url, url: Url) -> Option<Url> {
-    let cross_origin = referrer_url.origin() != url.origin();
     if referrer_url.scheme() == "https" && url.scheme() != "https" {
         return None;
-    } else {
-        if cross_origin {
-            return strip_url(referrer_url, true);
-        }
-        return strip_url(referrer_url, false);
     }
+    let cross_origin = referrer_url.origin() != url.origin();
+    return strip_url(referrer_url, cross_origin);
 }
 
 /// https://w3c.github.io/webappsec-referrer-policy/#strip-url

components/net_traits/lib.rs

@@ -125,6 +125,10 @@ pub enum ReferrerPolicy {
     OriginWhenCrossOrigin,
     /// "unsafe-url"
     UnsafeUrl,
+    /// "strict-origin"
+    StrictOrigin,
+    /// "strict-origin-when-cross-origin"
+    StrictOriginWhenCrossOrigin,
 }
 
 #[derive(Clone, Deserialize, Serialize, HeapSizeOf)]