Move container policy logic to frame owner classes.

third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp

 /*
  * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 190 matching lines @@
 }
 
 DOMWindow* HTMLFrameOwnerElement::contentWindow() const {
   return content_frame_ ? content_frame_->DomWindow() : 0;
 }
 
 void HTMLFrameOwnerElement::SetSandboxFlags(SandboxFlags flags) {
   sandbox_flags_ = flags;
   // Recalculate the container policy in case the allow-same-origin flag has
   // changed.
-  container_policy_ = GetContainerPolicyFromAllowedFeatures(
-      AllowedFeatures(), AllowFullscreen(), AllowPaymentRequest(),
-      GetOriginForFeaturePolicy());
+  container_policy_ = ConstructContainerPolicy();
 
   // Don't notify about updates if ContentFrame() is null, for example when
   // the subframe hasn't been created yet.
   if (ContentFrame()) {
     GetDocument().GetFrame()->Loader().Client()->DidChangeFramePolicy(
         ContentFrame(), sandbox_flags_, container_policy_);
   }
 }
 
 bool HTMLFrameOwnerElement::IsKeyboardFocusable() const {
   return content_frame_ && HTMLElement::IsKeyboardFocusable();
 }
 
 void HTMLFrameOwnerElement::DisposeFrameOrPluginSoon(
     FrameOrPlugin* frame_or_plugin) {
   if (g_update_suspend_count) {
     FrameOrPluginsPendingDispose().insert(frame_or_plugin);
   } else {
     frame_or_plugin->Dispose();
   }
 }
 
 void HTMLFrameOwnerElement::UpdateContainerPolicy() {
-  container_policy_ = GetContainerPolicyFromAllowedFeatures(
-      AllowedFeatures(), AllowFullscreen(), AllowPaymentRequest(),
-      GetOriginForFeaturePolicy());
+  container_policy_ = ConstructContainerPolicy();
   // Don't notify about updates if ContentFrame() is null, for example when
   // the subframe hasn't been created yet.
   if (ContentFrame()) {
     GetDocument().GetFrame()->Loader().Client()->DidChangeFramePolicy(
         ContentFrame(), sandbox_flags_, container_policy_);
   }
 }
 
 void HTMLFrameOwnerElement::FrameOwnerPropertiesChanged() {
   // Don't notify about updates if ContentFrame() is null, for example when
@@ skipping 111 matching lines @@
 }
 
 DEFINE_TRACE(HTMLFrameOwnerElement) {
   visitor->Trace(content_frame_);
   visitor->Trace(widget_);
   HTMLElement::Trace(visitor);
   FrameOwner::Trace(visitor);
 }
 
 }  // namespace blink