Replace string by enum in WebParsedFeaturePolicyDeclaration#feature

third_party/WebKit/Source/platform/feature_policy/FeaturePolicy.cpp

 // Copyright 2016 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 "platform/feature_policy/FeaturePolicy.h"
 
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/json/JSONValues.h"
 #include "platform/network/HTTPParsers.h"
 #include "platform/weborigin/SecurityOrigin.h"
@@ skipping 39 matching lines @@
                                                 RefPtr<SecurityOrigin> origin,
                                                 Vector<String>* messages) {
   Vector<WebParsedFeaturePolicyDeclaration> whitelists;
 
   // Use a reasonable parse depth limit; the actual maximum depth is only going
   // to be 4 for a valid policy, but we'll give the featurePolicyParser a chance
   // to report more specific errors, unless the string is really invalid.
   std::unique_ptr<JSONArray> policyItems = parseJSONHeader(policy, 50);
   if (!policyItems) {
     if (messages)
-      messages->push_back("Unable to parse header");
+      messages->push_back("Unable to parse header.");
     return whitelists;
   }
 
   for (size_t i = 0; i < policyItems->size(); ++i) {
     JSONObject* item = JSONObject::cast(policyItems->at(i));
     if (!item) {
       if (messages)
-        messages->push_back("Policy is not an object");
+        messages->push_back("Policy is not an object.");
       continue;  // Array element is not an object; skip
     }
 
     for (size_t j = 0; j < item->size(); ++j) {
       JSONObject::Entry entry = item->at(j);
-      String featureName = entry.first;
+      WebFeaturePolicyFeature feature = getWebFeaturePolicyFeature(entry.first);
+      if (feature == WebFeaturePolicyFeature::NotFound) {
+        if (messages)
+          messages->push_back("Feature name is unrecognized.");

[iclelland, 2017/03/15 15:33:02]

I don't think we should report this like an error -- it is likely that other
browers, or even other versions of chrome, will support feature names that we
don't currently recognize. In that case, we should just ignore those names, as
silently as possible.

+        continue;  // Unrecognized feature; skip
+      }
       JSONArray* targets = JSONArray::cast(entry.second);
       if (!targets) {
         if (messages)
           messages->push_back("Whitelist is not an array of strings.");
         continue;
       }
 
       WebParsedFeaturePolicyDeclaration whitelist;
-      whitelist.featureName = featureName;
+      whitelist.feature = feature;
       Vector<WebSecurityOrigin> origins;
       String targetString;
       for (size_t j = 0; j < targets->size(); ++j) {
         if (targets->at(j)->asString(&targetString)) {
           if (equalIgnoringCase(targetString, "self")) {
             if (!origin->isUnique())
               origins.push_back(origin);
           } else if (targetString == "*") {
             whitelist.matchesAllOrigins = true;
           } else {
             WebSecurityOrigin targetOrigin =
                 WebSecurityOrigin::createFromString(targetString);
             if (!targetOrigin.isNull() && !targetOrigin.isUnique())
               origins.push_back(targetOrigin);
           }
         } else {
           if (messages)
             messages->push_back("Whitelist is not an array of strings.");
         }
       }
       whitelist.origins = origins;
       whitelists.push_back(whitelist);
     }
   }
   return whitelists;
 }
 
 }  // namespace blink