Separate ContentSettingsClient out from LocalFrameClient

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

Index: third_party/WebKit/Source/core/dom/Document.cpp
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
index 43aaf0a8818e7d3dffa5b297bf1756910e408cac..d1f21da42260238c9020d34b7bc92e28a26fa0ee 100644
--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
@@ -135,6 +135,7 @@
 #include "core/events/ScopedEventQueue.h"
 #include "core/events/VisualViewportResizeEvent.h"
 #include "core/events/VisualViewportScrollEvent.h"
+#include "core/frame/ContentSettingsClient.h"
 #include "core/frame/DOMTimer.h"
 #include "core/frame/DOMVisualViewport.h"
 #include "core/frame/EventHandlerRegistry.h"
@@ -5639,14 +5640,14 @@ bool Document::canExecuteScripts(ReasonForCallingCanExecuteScripts reason) {
   DCHECK(frame())
       << "you are querying canExecuteScripts on a non contextDocument.";
 
-  LocalFrameClient* client = frame()->loader().client();
-  if (!client)
+  ContentSettingsClient* settingsClient = frame()->contentSettingsClient();
+  if (!settingsClient)
     return false;
 
   Settings* settings = frame()->settings();
-  if (!client->allowScript(settings && settings->getScriptEnabled())) {
+  if (!settingsClient->allowScript(settings && settings->getScriptEnabled())) {
     if (reason == AboutToExecuteScript)
-      client->didNotAllowScript();
+      settingsClient->didNotAllowScript();
 
     return false;
   }