Rename feature policy classes.

content/renderer/render_frame_impl.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/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 856 matching lines @@
 #else
   return true;
 #endif
 }
 #endif  // defined(ENABLE_MOJO_CDM)
 
 double ConvertToBlinkTime(const base::TimeTicks& time_ticks) {
   return (time_ticks - base::TimeTicks()).InSecondsF();
 }
 
-ParsedFeaturePolicy ToParsedFeaturePolicy(
-    const blink::WebParsedFeaturePolicy& web_parsed_whitelists) {
-  ParsedFeaturePolicy result;
-  for (const blink::WebFeaturePolicy::ParsedWhitelist& web_whitelist :
-       web_parsed_whitelists) {
-    FeaturePolicyParsedWhitelist whitelist;
-    whitelist.feature_name = web_whitelist.featureName.utf8();
-    whitelist.matches_all_origins = web_whitelist.matchesAllOrigins;
-    for (const blink::WebSecurityOrigin& web_origin : web_whitelist.origins)
-      whitelist.origins.push_back(web_origin);
-    result.push_back(whitelist);
+ParsedFeaturePolicyHeader ToParsedFeaturePolicyHeader(
+    const blink::WebParsedFeaturePolicyHeader& parsed_header) {
+  ParsedFeaturePolicyHeader result;
+  for (const blink::WebParsedFeaturePolicyDeclaration& web_declaration :
+       parsed_header) {
+    ParsedFeaturePolicyDeclaration declaration;
+    declaration.feature_name = web_declaration.featureName.utf8();
+    declaration.matches_all_origins = web_declaration.matchesAllOrigins;
+    for (const blink::WebSecurityOrigin& web_origin : web_declaration.origins)
+      declaration.origins.push_back(web_origin);
+    result.push_back(declaration);
   }
   return result;
 }
 
 }  // namespace
 
 struct RenderFrameImpl::PendingFileChooser {
   PendingFileChooser(const FileChooserParams& p,
                      blink::WebFileChooserCompletion* c)
       : params(p), completion(c) {}
@@ skipping 2291 matching lines @@
       routing_id_, is_potentially_trustworthy_unique_origin));
 }
 
 void RenderFrameImpl::didChangeSandboxFlags(blink::WebFrame* child_frame,
                                             blink::WebSandboxFlags flags) {
   Send(new FrameHostMsg_DidChangeSandboxFlags(
       routing_id_, GetRoutingIdForFrameOrProxy(child_frame), flags));
 }
 
 void RenderFrameImpl::didSetFeaturePolicyHeader(
-    const blink::WebParsedFeaturePolicy& parsed_header) {
+    const blink::WebParsedFeaturePolicyHeader& parsed_header) {
   Send(new FrameHostMsg_DidSetFeaturePolicyHeader(
-      routing_id_, ToParsedFeaturePolicy(parsed_header)));
+      routing_id_, ToParsedFeaturePolicyHeader(parsed_header)));
 }
 
 void RenderFrameImpl::didAddContentSecurityPolicy(
     const blink::WebString& header_value,
     blink::WebContentSecurityPolicyType type,
     blink::WebContentSecurityPolicySource source) {
   if (!SiteIsolationPolicy::AreCrossProcessFramesPossible())
     return;
 
   ContentSecurityPolicyHeader header;
@@ skipping 3664 matching lines @@
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
 }  // namespace content