Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/core/loader/FrameLoader.cpp

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index 53f7684b8db3ea884fdd141dbc5b29bc0ca880a9..6a60f47540769500a2559c0b70066f7088f5a45e 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -50,6 +50,7 @@
 #include "core/events/KeyboardEvent.h"
 #include "core/events/MouseEvent.h"
 #include "core/events/PageTransitionEvent.h"
+#include "core/frame/ContentSettingsClient.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
@@ -555,10 +556,10 @@ bool FrameLoader::allowPlugins(ReasonForCallingAllowPlugins reason) {
   if (!client())
     return false;
   Settings* settings = m_frame->settings();
-  bool allowed =
-      client()->allowPlugins(settings && settings->getPluginsEnabled());
+  bool allowed = m_frame->contentSettingsClient()->allowPlugins(
+      settings && settings->getPluginsEnabled());
   if (!allowed && reason == AboutToInstantiatePlugin)
-    client()->didNotAllowPlugins();
+    m_frame->contentSettingsClient()->didNotAllowPlugins();
   return allowed;
 }