Make content::FeaturePolicy implement WebFeaturePolicy, and use it in blink code

third_party/WebKit/Source/core/loader/FrameLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
@@ skipping 566 matching lines @@
       if (!headerContentLanguage.isEmpty()) {
         m_frame->document()->setContentLanguage(
             AtomicString(headerContentLanguage));
       }
     }
 
     OriginTrialContext::addTokensFromHeader(
         m_frame->document(),
         m_documentLoader->response().httpHeaderField(HTTPNames::Origin_Trial));
     if (RuntimeEnabledFeatures::featurePolicyEnabled()) {
-      FeaturePolicy* parentFeaturePolicy =
+      WebFeaturePolicy* parentFeaturePolicy =
           (isLoadingMainFrame() ? nullptr
                                 : m_frame->client()
                                       ->parent()
                                       ->securityContext()
                                       ->getFeaturePolicy());
       const String& featurePolicyHeader =
           m_documentLoader->response().httpHeaderField(
               HTTPNames::Feature_Policy);
       Vector<String> messages;
       const WebParsedFeaturePolicyHeader& parsedHeader =
           FeaturePolicy::parseFeaturePolicy(
               featurePolicyHeader,
               m_frame->securityContext()->getSecurityOrigin(), &messages);
-      m_frame->securityContext()->setFeaturePolicyFromHeader(
-          parsedHeader, parentFeaturePolicy);
+      m_frame->securityContext()->initializeFeaturePolicy(parsedHeader,
+                                                          parentFeaturePolicy);
       for (auto& message : messages) {
         m_frame->document()->addConsoleMessage(ConsoleMessage::create(
             OtherMessageSource, ErrorMessageLevel,
             "Error with Feature-Policy header: " + message));
       }
       if (!parsedHeader.isEmpty())
         client()->didSetFeaturePolicyHeader(parsedHeader);
     }
   }
 
@@ skipping 1423 matching lines @@
   m_isNavigationHandledByClient = true;
   InspectorInstrumentation::frameScheduledClientNavigation(m_frame);
 }
 
 void FrameLoader::clearNavigationHandledByClient() {
   m_isNavigationHandledByClient = false;
   InspectorInstrumentation::frameClearedScheduledClientNavigation(m_frame);
 }
 
 }  // namespace blink