Move FeaturePolicy object to SecurityContext

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 561 matching lines @@
             AtomicString(headerContentLanguage));
       }
     }
 
     OriginTrialContext::addTokensFromHeader(
         m_frame->document(),
         m_documentLoader->response().httpHeaderField(HTTPNames::Origin_Trial));
     if (RuntimeEnabledFeatures::featurePolicyEnabled()) {
       std::unique_ptr<FeaturePolicy> featurePolicy(
           FeaturePolicy::createFromParentPolicy(
-              (isLoadingMainFrame()
-                   ? nullptr
-                   : m_frame->client()->parent()->getFeaturePolicy()),
+              (isLoadingMainFrame() ? nullptr
+                                    : m_frame->client()
+                                          ->parent()
+                                          ->securityContext()
+                                          ->getFeaturePolicy()),
               m_frame->securityContext()->getSecurityOrigin()));
       Vector<String> messages;
       featurePolicy->setHeaderPolicy(
           m_documentLoader->response().httpHeaderField(
               HTTPNames::Feature_Policy),
           messages);
       for (auto& message : messages) {
         m_frame->document()->addConsoleMessage(ConsoleMessage::create(
             OtherMessageSource, ErrorMessageLevel,
             "Error with Feature-Policy header: " + message));
       }
-      m_frame->setFeaturePolicy(std::move(featurePolicy));
+      m_frame->document()->setFeaturePolicy(std::move(featurePolicy));
     }
   }
 
   if (m_documentLoader) {
     String referrerPolicyHeader = m_documentLoader->response().httpHeaderField(
         HTTPNames::Referrer_Policy);
     if (!referrerPolicyHeader.isNull()) {
       m_frame->document()->parseAndSetReferrerPolicy(referrerPolicyHeader);
     }
   }
@@ skipping 1338 matching lines @@
                          m_documentLoader ? m_documentLoader->url() : String());
   return tracedValue;
 }
 
 inline void FrameLoader::takeObjectSnapshot() const {
   TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
                                       toTracedValue());
 }
 
 }  // namespace blink