Rename feature policy classes.

content/renderer/render_frame_proxy.cc

 // Copyright 2014 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/renderer/render_frame_proxy.h"
 
 #include <stdint.h>
 #include <map>
 #include <utility>
 
@@ skipping 31 matching lines @@
 
 // Facilitates lookup of RenderFrameProxy by routing_id.
 typedef std::map<int, RenderFrameProxy*> RoutingIDProxyMap;
 static base::LazyInstance<RoutingIDProxyMap> g_routing_id_proxy_map =
     LAZY_INSTANCE_INITIALIZER;
 
 // Facilitates lookup of RenderFrameProxy by WebFrame.
 typedef std::map<blink::WebFrame*, RenderFrameProxy*> FrameMap;
 base::LazyInstance<FrameMap> g_frame_map = LAZY_INSTANCE_INITIALIZER;
 
-blink::WebParsedFeaturePolicy ToWebParsedFeaturePolicy(
-    const ParsedFeaturePolicy& parsed_whitelists) {
-  std::vector<blink::WebFeaturePolicy::ParsedWhitelist> result;
-  for (const FeaturePolicyParsedWhitelist& whitelist : parsed_whitelists) {
-    blink::WebFeaturePolicy::ParsedWhitelist web_whitelist;
-    web_whitelist.featureName =
-        blink::WebString::fromUTF8(whitelist.feature_name);
-    web_whitelist.matchesAllOrigins = whitelist.matches_all_origins;
+blink::WebParsedFeaturePolicyHeader ToWebParsedFeaturePolicyHeader(
+    const ParsedFeaturePolicyHeader& parsed_header) {
+  std::vector<blink::WebParsedFeaturePolicyDeclaration> result;
+  for (const ParsedFeaturePolicyDeclaration& declaration : parsed_header) {
+    blink::WebParsedFeaturePolicyDeclaration web_declaration;
+    web_declaration.featureName =
+        blink::WebString::fromUTF8(declaration.feature_name);
+    web_declaration.matchesAllOrigins = declaration.matches_all_origins;
     std::vector<blink::WebSecurityOrigin> web_origins;
-    for (const url::Origin& origin : whitelist.origins)
+    for (const url::Origin& origin : declaration.origins)
       web_origins.push_back(origin);
-    web_whitelist.origins = web_origins;
-    result.push_back(web_whitelist);
+    web_declaration.origins = web_origins;
+    result.push_back(web_declaration);
   }
   return result;
 }
 
 }  // namespace
 
 // static
 RenderFrameProxy* RenderFrameProxy::CreateProxyToReplaceFrame(
     RenderFrameImpl* frame_to_replace,
     int routing_id,
@@ skipping 159 matching lines @@
 void RenderFrameProxy::SetReplicatedState(const FrameReplicationState& state) {
   DCHECK(web_frame_);
   web_frame_->setReplicatedOrigin(state.origin);
   web_frame_->setReplicatedSandboxFlags(state.sandbox_flags);
   web_frame_->setReplicatedName(blink::WebString::fromUTF8(state.name),
                                 blink::WebString::fromUTF8(state.unique_name));
   web_frame_->setReplicatedInsecureRequestPolicy(state.insecure_request_policy);
   web_frame_->setReplicatedPotentiallyTrustworthyUniqueOrigin(
       state.has_potentially_trustworthy_unique_origin);
   web_frame_->setReplicatedFeaturePolicyHeader(
-      ToWebParsedFeaturePolicy(state.feature_policy_header));
+      ToWebParsedFeaturePolicyHeader(state.feature_policy_header));
   if (state.has_received_user_gesture)
     web_frame_->setHasReceivedUserGesture();
 
   web_frame_->resetReplicatedContentSecurityPolicy();
   for (const auto& header : state.accumulated_csp_headers)
     OnAddContentSecurityPolicy(header);
 }
 
 // Update the proxy's SecurityContext and FrameOwner with new sandbox flags
 // that were set by its parent in another process.
@@ skipping 286 matching lines @@
                                     blink::WebLocalFrame* source) {
   int source_routing_id = RenderFrameImpl::FromWebFrame(source)->GetRoutingID();
   Send(new FrameHostMsg_AdvanceFocus(routing_id_, type, source_routing_id));
 }
 
 void RenderFrameProxy::frameFocused() {
   Send(new FrameHostMsg_FrameFocused(routing_id_));
 }
 
 }  // namespace