Move Feature Policy test to Frame

third_party/WebKit/Source/modules/vibration/NavigatorVibration.cpp

 /*
  *  Copyright (C) 2012 Samsung Electronics
  *
  *  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
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *  Library General Public License for more details.
  *
  *  You should have received a copy of the GNU Library General Public License
  *  along with this library; see the file COPYING.LIB.  If not, write to
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  */
 
 #include "modules/vibration/NavigatorVibration.h"
 
-#include "bindings/core/v8/ConditionalFeaturesForCore.h"
 #include "core/dom/Document.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
 #include "core/frame/UseCounter.h"
 #include "core/page/Page.h"
 #include "modules/vibration/VibrationController.h"
 #include "platform/Histogram.h"
 #include "platform/UserGestureIndicator.h"
 #include "public/platform/site_engagement.mojom-blink.h"
@@ skipping 42 matching lines @@
 
   DCHECK(frame->document());
   DCHECK(frame->page());
 
   if (!frame->page()->isPageVisible())
     return false;
 
   // TODO(lunalu): When FeaturePolicy is ready, take out the check for the
   // runtime flag. Please pay attention to the user gesture code below.
   if (RuntimeEnabledFeatures::featurePolicyEnabled() &&
-      !isFeatureEnabledInFrame(blink::WebFeaturePolicyFeature::Vibrate,
-                               frame)) {
+      !frame->isFeatureEnabled(blink::WebFeaturePolicyFeature::Vibrate)) {
     frame->domWindow()->printErrorMessage(
         "Navigator.vibrate() is not enabled in feature policy for this "
         "frame.");
     return false;
   }
 
   if (!RuntimeEnabledFeatures::featurePolicyEnabled() &&
       frame->isCrossOriginSubframe() && !frame->hasReceivedUserGesture()) {
     frame->domWindow()->printErrorMessage(
         "Blocked call to navigator.vibrate inside a cross-origin iframe "
@@ skipping 70 matching lines @@
   }
 }
 
 DEFINE_TRACE(NavigatorVibration) {
   visitor->trace(m_controller);
   Supplement<Navigator>::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink