Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/web/LocalFrameClientImpl.cpp

Index: third_party/WebKit/Source/web/LocalFrameClientImpl.cpp
diff --git a/third_party/WebKit/Source/web/LocalFrameClientImpl.cpp b/third_party/WebKit/Source/web/LocalFrameClientImpl.cpp
index 0098a74c7df56d21f8ae5625965f14619200b80b..3b62780d12f408e6154cc64c69ed4b3b453f56a3 100644
--- a/third_party/WebKit/Source/web/LocalFrameClientImpl.cpp
+++ b/third_party/WebKit/Source/web/LocalFrameClientImpl.cpp
@@ -84,7 +84,6 @@
 #include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerProviderClient.h"
 #include "public/web/WebAutofillClient.h"
-#include "public/web/WebContentSettingsClient.h"
 #include "public/web/WebDOMEvent.h"
 #include "public/web/WebDocument.h"
 #include "public/web/WebFormElement.h"
@@ -225,77 +224,6 @@ void LocalFrameClientImpl::didUpdateCurrentHistoryItem() {
     m_webFrame->client()->didUpdateCurrentHistoryItem();
 }
 
-bool LocalFrameClientImpl::allowScript(bool enabledPerSettings) {
-  if (m_webFrame->contentSettingsClient())
-    return m_webFrame->contentSettingsClient()->allowScript(enabledPerSettings);
-
-  return enabledPerSettings;
-}
-
-bool LocalFrameClientImpl::allowScriptFromSource(bool enabledPerSettings,
-                                                 const KURL& scriptURL) {
-  if (m_webFrame->contentSettingsClient()) {
-    return m_webFrame->contentSettingsClient()->allowScriptFromSource(
-        enabledPerSettings, scriptURL);
-  }
-
-  return enabledPerSettings;
-}
-
-bool LocalFrameClientImpl::allowPlugins(bool enabledPerSettings) {
-  if (m_webFrame->contentSettingsClient()) {
-    return m_webFrame->contentSettingsClient()->allowPlugins(
-        enabledPerSettings);
-  }
-
-  return enabledPerSettings;
-}
-
-bool LocalFrameClientImpl::allowImage(bool enabledPerSettings,
-                                      const KURL& imageURL) {
-  if (m_webFrame->contentSettingsClient()) {
-    return m_webFrame->contentSettingsClient()->allowImage(enabledPerSettings,
-                                                           imageURL);
-  }
-
-  return enabledPerSettings;
-}
-
-bool LocalFrameClientImpl::allowRunningInsecureContent(bool enabledPerSettings,
-                                                       SecurityOrigin* context,
-                                                       const KURL& url) {
-  if (m_webFrame->contentSettingsClient()) {
-    return m_webFrame->contentSettingsClient()->allowRunningInsecureContent(
-        enabledPerSettings, WebSecurityOrigin(context), WebURL(url));
-  }
-
-  return enabledPerSettings;
-}
-
-bool LocalFrameClientImpl::allowAutoplay(bool defaultValue) {
-  if (m_webFrame->contentSettingsClient())
-    return m_webFrame->contentSettingsClient()->allowAutoplay(defaultValue);
-
-  return defaultValue;
-}
-
-void LocalFrameClientImpl::passiveInsecureContentFound(const KURL& url) {
-  if (m_webFrame->contentSettingsClient()) {
-    return m_webFrame->contentSettingsClient()->passiveInsecureContentFound(
-        WebURL(url));
-  }
-}
-
-void LocalFrameClientImpl::didNotAllowScript() {
-  if (m_webFrame->contentSettingsClient())
-    m_webFrame->contentSettingsClient()->didNotAllowScript();
-}
-
-void LocalFrameClientImpl::didNotAllowPlugins() {
-  if (m_webFrame->contentSettingsClient())
-    m_webFrame->contentSettingsClient()->didNotAllowPlugins();
-}
-
 bool LocalFrameClientImpl::hasWebView() const {
   return m_webFrame->viewImpl();
 }
@@ -963,6 +891,10 @@ LocalFrameClientImpl::createServiceWorkerProvider() {
   return WTF::wrapUnique(m_webFrame->client()->createServiceWorkerProvider());
 }
 
+ContentSettingsClient& LocalFrameClientImpl::contentSettingsClient() {

[haraken, 2017/04/04 11:25:32]

Nit: I'd prefer removing this helper.

[kinuko, 2017/04/04 14:50:56]

Actually I wanted to do so too, but having this helper made things a lot easier
for testing plumbing.  (I suppose frame cleanup project will be incrementally
cleaning up these methods too anyways)

+  return m_webFrame->contentSettingsClient();
+}
+
 SharedWorkerRepositoryClient*
 LocalFrameClientImpl::sharedWorkerRepositoryClient() {
   return m_webFrame->sharedWorkerRepositoryClient();