Upgrade: Drop the 'upgraded' signal, expand the 'https' signal.

Source/core/loader/FrameFetchContextTest.cpp

 /*
  * Copyright (c) 2015, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 67 matching lines @@
         fetchRequest.mutableResourceRequest().setFrameType(frameType);
 
         fetchContext->upgradeInsecureRequest(fetchRequest);
 
         EXPECT_STREQ(expectedURL.string().utf8().data(), fetchRequest.resourceRequest().url().string().utf8().data());
         EXPECT_EQ(expectedURL.protocol(), fetchRequest.resourceRequest().url().protocol());
         EXPECT_EQ(expectedURL.host(), fetchRequest.resourceRequest().url().host());
         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)
+    void expectHTTPSHeader(const char* input, WebURLRequest::FrameType frameType, bool shouldPrefer)
     {
         KURL inputURL(ParsedURLString, input);
 
         FetchRequest fetchRequest = FetchRequest(ResourceRequest(inputURL), FetchInitiatorInfo());
         fetchRequest.mutableResourceRequest().setRequestContext(WebURLRequest::RequestContextScript);
         fetchRequest.mutableResourceRequest().setFrameType(frameType);
 
         fetchContext->upgradeInsecureRequest(fetchRequest);
 
-        EXPECT_STREQ(shouldPrefer ? "tls" : "",
-            fetchRequest.resourceRequest().httpHeaderField("Prefer").utf8().data());
+        EXPECT_STREQ(shouldPrefer ? "1" : "",
+            fetchRequest.resourceRequest().httpHeaderField("HTTPS").utf8().data());
     }
 
     KURL secureURL;
     RefPtr<SecurityOrigin> exampleOrigin;
     RefPtr<SecurityOrigin> secureOrigin;
 
     OwnPtr<DummyPageHolder> dummyPageHolder;
     // We don't use the DocumentLoader directly in any tests, but need to keep it around as long
     // as the ResourceFetcher and Document live due to indirect usage.
     RefPtr<DocumentLoader> documentLoader;
@@ skipping 66 matching lines @@
 {
     struct TestCase {
         const char* toRequest;
         WebURLRequest::FrameType frameType;
         bool shouldPrefer;
     } tests[] = {
         { "http://example.test/page.html", WebURLRequest::FrameTypeAuxiliary, true },
         { "http://example.test/page.html", WebURLRequest::FrameTypeNested, true },
         { "http://example.test/page.html", WebURLRequest::FrameTypeNone, false },
         { "http://example.test/page.html", WebURLRequest::FrameTypeTopLevel, true },
-        { "https://example.test/page.html", WebURLRequest::FrameTypeAuxiliary, false },
-        { "https://example.test/page.html", WebURLRequest::FrameTypeNested, false },
+        { "https://example.test/page.html", WebURLRequest::FrameTypeAuxiliary, true },
+        { "https://example.test/page.html", WebURLRequest::FrameTypeNested, true },
         { "https://example.test/page.html", WebURLRequest::FrameTypeNone, false },
-        { "https://example.test/page.html", WebURLRequest::FrameTypeTopLevel, false }
+        { "https://example.test/page.html", WebURLRequest::FrameTypeTopLevel, true }
     };
 
     for (auto test : tests) {
         document->setInsecureRequestsPolicy(SecurityContext::InsecureRequestsDoNotUpgrade);
-        expectPreferHeader(test.toRequest, test.frameType, test.shouldPrefer);
+        expectHTTPSHeader(test.toRequest, test.frameType, test.shouldPrefer);
 
         document->setInsecureRequestsPolicy(SecurityContext::InsecureRequestsUpgrade);
-        expectPreferHeader(test.toRequest, test.frameType, test.shouldPrefer);
+        expectHTTPSHeader(test.toRequest, test.frameType, test.shouldPrefer);
     }
 }
 
 class FrameFetchContextHintsTest : public ::testing::Test {
 public:
     FrameFetchContextHintsTest() { }
 
 protected:
     virtual void SetUp()
     {
@@ skipping 50 matching lines @@
     expectHeader("http://www.example.com/1.gif", "RW", false, "");
 
     dummyPageHolder->frame().setShouldSendDPRHint();
     dummyPageHolder->frame().setShouldSendRWHint();
     expectHeader("http://www.example.com/1.gif", "DPR", true, "1");
     expectHeader("http://www.example.com/1.gif", "RW", true, "500");
 }
 
 } // namespace