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

content/browser/frame_host/frame_tree_node.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/frame_tree_node.h"
 
 #include <queue>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 84 matching lines @@
       parent_(parent),
       opener_(nullptr),
       opener_observer_(nullptr),
       has_committed_real_load_(false),
       replication_state_(
           scope,
           name,
           unique_name,
           blink::WebSandboxFlags::None,
           false /* should enforce strict mixed content checking */,
+          std::vector<uint32_t>() /* insecure urls to upgrade */,
           false /* is a potentially trustworthy unique origin */),
       pending_sandbox_flags_(blink::WebSandboxFlags::None),
       frame_owner_properties_(frame_owner_properties),
       loading_progress_(kLoadingProgressNotStarted),
       blame_context_(frame_tree_node_id_, parent) {
   std::pair<FrameTreeNodeIdMap::iterator, bool> result =
       g_frame_tree_node_id_map.Get().insert(
           std::make_pair(frame_tree_node_id_, this));
   CHECK(result.second);
 
@@ skipping 161 matching lines @@
 }
 
 void FrameTreeNode::SetInsecureRequestPolicy(
     blink::WebInsecureRequestPolicy policy) {
   if (policy == replication_state_.insecure_request_policy)
     return;
   render_manager_.OnEnforceInsecureRequestPolicy(policy);
   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;
 
   // Subframes should always inherit their parent's sandbox flags.
   if (parent())
     pending_sandbox_flags_ |= parent()->effective_sandbox_flags();
 }
 
 bool FrameTreeNode::IsDescendantOf(FrameTreeNode* other) const {
@@ skipping 225 matching lines @@
       }
       return parent_->child_at(i + relative_offset);
     }
   }
 
   NOTREACHED() << "FrameTreeNode not found in its parent's children.";
   return nullptr;
 }
 
 }  // namespace content