Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/core/html/ImageDocument.cpp

Index: third_party/WebKit/Source/core/html/ImageDocument.cpp
diff --git a/third_party/WebKit/Source/core/html/ImageDocument.cpp b/third_party/WebKit/Source/core/html/ImageDocument.cpp
index 25567880834aeb7d9da389acc87c7ab45f7b09a0..a03085a1f1f1b33c13e6028e0e5f93c1c67a8a43 100644
--- a/third_party/WebKit/Source/core/html/ImageDocument.cpp
+++ b/third_party/WebKit/Source/core/html/ImageDocument.cpp
@@ -30,6 +30,7 @@
 #include "core/dom/RawDataDocumentParser.h"
 #include "core/events/EventListener.h"
 #include "core/events/MouseEvent.h"
+#include "core/frame/ContentSettingsClient.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
@@ -142,7 +143,7 @@ void ImageDocumentParser::appendBytes(const char* data, size_t length) {
 
   LocalFrame* frame = document()->frame();
   Settings* settings = frame->settings();
-  if (!frame->loader().client()->allowImage(
+  if (!frame->contentSettingsClient()->allowImage(
           !settings || settings->getImagesEnabled(), document()->url()))
     return;