Introduce content-side Feature Policy object and maintain in parallel with renderer policy.

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/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/stl_util.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/navigation_request.h"
 #include "content/browser/frame_host/navigator.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/common/feature_policy/feature_policy.h"

[alexmos, 2017/02/09 05:59:50]

This is no longer needed, right?

[iclelland, 2017/02/09 17:16:17]

It's still used for the definition of ParsedFeaturePolicyHeader, but that ends
up being included transitively through frame_tree_node.h ->
frame_replication_state.h -> feature_policy.h.

The normal thing here would be to leave this include in, and forward-declare in
frame_tree_node.h, but it's actually a using-declaration, so it's going to be
awkward to do that :(

I've just removed the include from this file, to at least be consistent.

 #include "content/common/frame_messages.h"
 #include "content/common/site_isolation_policy.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "third_party/WebKit/public/web/WebSandboxFlags.h"
 
 namespace content {
 
 namespace {
 
@@ skipping 248 matching lines @@
   render_manager_.OnDidUpdateName(name, unique_name);
   replication_state_.name = name;
   replication_state_.unique_name = unique_name;
 }
 
 void FrameTreeNode::SetFeaturePolicyHeader(
     const ParsedFeaturePolicyHeader& parsed_header) {
   replication_state_.feature_policy_header = parsed_header;
 }
 
-void FrameTreeNode::ResetFeaturePolicy() {
+void FrameTreeNode::ResetFeaturePolicyHeader() {
   replication_state_.feature_policy_header.clear();
 }
 
 void FrameTreeNode::AddContentSecurityPolicy(
     const ContentSecurityPolicyHeader& header) {
   replication_state_.accumulated_csp_headers.push_back(header);
   render_manager_.OnDidAddContentSecurityPolicy(header);
 }
 
 void FrameTreeNode::ResetContentSecurityPolicy() {
@@ skipping 252 matching lines @@
       }
       return parent_->child_at(i + relative_offset);
     }
   }
 
   NOTREACHED() << "FrameTreeNode not found in its parent's children.";
   return nullptr;
 }
 
 }  // namespace content