PlzNavigate: support upgrade-insecure-navigation.

third_party/WebKit/Source/core/loader/FrameLoader.cpp

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 0eb7138c45286ea4e9666d26bf2644b00a2aa9fc..f6059c1b854e3b80c9a31183ebdd87d254088764 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -66,6 +66,7 @@
 #include "core/loader/DocumentLoadTiming.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FormSubmission.h"
+#include "core/loader/FrameFetchContext.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/loader/LinkLoader.h"
@@ -1424,6 +1425,7 @@ void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest, FrameLoadType ty
     frameLoadRequest.resourceRequest().setRequestContext(determineRequestContextFromNavigationType(navigationType));
     frameLoadRequest.resourceRequest().setFrameType(m_frame->isMainFrame() ? WebURLRequest::FrameTypeTopLevel : WebURLRequest::FrameTypeNested);
     ResourceRequest& request = frameLoadRequest.resourceRequest();
+    FrameFetchContext::upgradeInsecureRequest(request, nullptr, this);

[Nate Chapin, 2016/08/26 16:04:34]

Calls to the FetchContext outside of core/fetch tend to be pretty rare. I'm
wondering if this is a signal that upgradeInsecureRequest() should just live on
FrameLoader.

[arthursonzogni, 2016/08/26 16:38:34]

Yes, I was wondering where I could put this function.
I keep in in FrameFetchContext and would to know what could be the best thing to
do then.
I had no intention to keep it here :)

This method needs to know which policy to apply and of course the request to be
updated. But maybe it is easier to find from which object to take these
information when you are in a FrameFetchContext.

[Mike West, 2016/08/31 13:22:50]

It's probably a signal that FrameFetchContext isn't a good fit for things that
modify navigations, potentially across renderer processes.

     if (!shouldContinueForNavigationPolicy(request, frameLoadRequest.substituteData(), nullptr, frameLoadRequest.shouldCheckMainWorldContentSecurityPolicy(), navigationType, navigationPolicy, type == FrameLoadTypeReplaceCurrentItem, frameLoadRequest.clientRedirect() == ClientRedirectPolicy::ClientRedirect))
         return;
 
@@ -1452,7 +1454,6 @@ void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest, FrameLoadType ty
     if (m_provisionalDocumentLoader->isClientRedirect())
         m_provisionalDocumentLoader->appendRedirect(m_frame->document()->url());
     m_provisionalDocumentLoader->appendRedirect(m_provisionalDocumentLoader->request().url());
-    m_provisionalDocumentLoader->upgradeInsecureRequest();

[Nate Chapin, 2016/08/26 16:04:34]

Looks like DocumentLoader::upgradeInsecureRequest() is no longer necessary.

[arthursonzogni, 2016/08/26 16:38:34]

Yes!

     double triggeringEventTime = frameLoadRequest.triggeringEvent() ? frameLoadRequest.triggeringEvent()->platformTimeStamp() : 0;
     client()->dispatchDidStartProvisionalLoad(triggeringEventTime);
     ASSERT(m_provisionalDocumentLoader);