Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/core/dom/ContextFeaturesClientImpl.cpp

Index: third_party/WebKit/Source/core/dom/ContextFeaturesClientImpl.cpp
diff --git a/third_party/WebKit/Source/web/ContextFeaturesClientImpl.cpp b/third_party/WebKit/Source/core/dom/ContextFeaturesClientImpl.cpp
similarity index 95%
rename from third_party/WebKit/Source/web/ContextFeaturesClientImpl.cpp
rename to third_party/WebKit/Source/core/dom/ContextFeaturesClientImpl.cpp
index c372838aac87c05ec645de62658cb44f5437a0f4..48c7fffca730e67c5810b61ef60ddb5a43b5e49b 100644
--- a/third_party/WebKit/Source/web/ContextFeaturesClientImpl.cpp
+++ b/third_party/WebKit/Source/core/dom/ContextFeaturesClientImpl.cpp
@@ -28,13 +28,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "web/ContextFeaturesClientImpl.h"
+#include "core/dom/ContextFeaturesClientImpl.h"
 
 #include "core/dom/Document.h"
+#include "core/frame/ContentSettingsClient.h"
 #include "platform/weborigin/SecurityOrigin.h"
-#include "public/web/WebContentSettingsClient.h"
-#include "public/web/WebDocument.h"
-#include "web/WebLocalFrameImpl.h"
 
 namespace blink {
 
@@ -135,7 +133,7 @@ bool ContextFeaturesClientImpl::askIfIsEnabled(
     Document* document,
     ContextFeatures::FeatureType type,
     bool defaultValue) {
-  WebLocalFrameImpl* frame = WebLocalFrameImpl::fromFrame(document->frame());
+  LocalFrame* frame = document->frame();
   if (!frame || !frame->contentSettingsClient())
     return defaultValue;