Upgrade: Add 'Upgraded' header, update 'Prefer' value.

Source/core/loader/FrameFetchContextTest.cpp

Index: Source/core/loader/FrameFetchContextTest.cpp
diff --git a/Source/core/loader/FrameFetchContextTest.cpp b/Source/core/loader/FrameFetchContextTest.cpp
index 7a1e8d4f37e35066df9bc02a610b4c06385376f1..7b53ed7deb60bd0833a3efa8f9f7fc6d35df5cfa 100644
--- a/Source/core/loader/FrameFetchContextTest.cpp
+++ b/Source/core/loader/FrameFetchContextTest.cpp
@@ -85,6 +85,11 @@ protected:
         EXPECT_EQ(expectedURL.port(), fetchRequest.resourceRequest().url().port());
         EXPECT_EQ(expectedURL.hasPort(), fetchRequest.resourceRequest().url().hasPort());
         EXPECT_EQ(expectedURL.path(), fetchRequest.resourceRequest().url().path());
+
+        bool expectUpgrade = inputURL != expectedURL;
+
+        EXPECT_STREQ(expectUpgrade ? "1" : "",
+            fetchRequest.resourceRequest().httpHeaderField("Upgraded").utf8().data());
     }
 
     void expectPreferHeader(const char* input, WebURLRequest::FrameType frameType, bool shouldPrefer)
@@ -97,7 +102,7 @@ protected:
 
         fetchContext->upgradeInsecureRequest(fetchRequest);
 
-        EXPECT_STREQ(shouldPrefer ? "return=secure-representation" : "",
+        EXPECT_STREQ(shouldPrefer ? "tls" : "",
             fetchRequest.resourceRequest().httpHeaderField("Prefer").utf8().data());
     }