Upgrade Insecure Requests: bugfixes, tests, and support for OOPIF.

content/browser/frame_host/frame_tree_node.cc

Index: content/browser/frame_host/frame_tree_node.cc
diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc
index a67de695a205b85c456d5c8f63254140222ec10f..f8d600d78062ddc0a29d25d2a11555af91204c36 100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -102,6 +102,7 @@ FrameTreeNode::FrameTreeNode(FrameTree* frame_tree,
           unique_name,
           blink::WebSandboxFlags::None,
           false /* should enforce strict mixed content checking */,
+          std::vector<uint32_t>() /* insecure url to upgrade */,

[nasko, 2016/12/12 23:11:30]

nit: since this is a vector, shouldn't url be plural? "urls"

[arthursonzogni, 2016/12/13 10:43:36]

Done.

           false /* is a potentially trustworthy unique origin */),
       pending_sandbox_flags_(blink::WebSandboxFlags::None),
       frame_owner_properties_(frame_owner_properties),
@@ -283,6 +284,16 @@ void FrameTreeNode::SetInsecureRequestPolicy(
   replication_state_.insecure_request_policy = policy;
 }
 
+void FrameTreeNode::SetInsecureNavigationsSet(
+    const std::vector<uint32_t>& insecure_navigations_set) {
+  DCHECK(std::is_sorted(insecure_navigations_set.begin(),
+                        insecure_navigations_set.end()));
+  if (insecure_navigations_set == replication_state_.insecure_navigations_set)
+    return;
+  render_manager_.OnEnforceInsecureNavigationsSet(insecure_navigations_set);
+  replication_state_.insecure_navigations_set = insecure_navigations_set;
+}
+
 void FrameTreeNode::SetPendingSandboxFlags(
     blink::WebSandboxFlags sandbox_flags) {
   pending_sandbox_flags_ = sandbox_flags;