Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
index 4b1eee0cf97db208f08a736174f0fb57443a3028..690d78c336b6e38fd711d498a0242c19e1f83b1f 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
@@ -118,6 +118,7 @@
 #include "core/editing/iterators/TextIterator.h"
 #include "core/editing/serializers/Serialization.h"
 #include "core/editing/spellcheck/SpellChecker.h"
+#include "core/frame/ContentSettingsClient.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/PageScaleConstraintsSet.h"
@@ -574,8 +575,8 @@ WebVector<WebIconURL> WebLocalFrameImpl::iconURLs(int iconTypesMask) const {
 }
 
 void WebLocalFrameImpl::setContentSettingsClient(
-    WebContentSettingsClient* contentSettingsClient) {
-  m_contentSettingsClient = contentSettingsClient;
+    WebContentSettingsClient* client) {
+  m_contentSettingsClient->setClient(client);
 }
 
 void WebLocalFrameImpl::setSharedWorkerRepositoryClient(
@@ -1567,7 +1568,7 @@ WebLocalFrameImpl::WebLocalFrameImpl(
       m_frameWidget(0),
       m_client(client),
       m_autofillClient(0),
-      m_contentSettingsClient(0),
+      m_contentSettingsClient(new ContentSettingsClient()),
       m_inputEventsScaleFactorForEmulation(1),
       m_interfaceProvider(interfaceProvider),
       m_interfaceRegistry(interfaceRegistry),
@@ -1603,6 +1604,7 @@ DEFINE_TRACE(WebLocalFrameImpl) {
   visitor->trace(m_textFinder);
   visitor->trace(m_printContext);
   visitor->trace(m_contextMenuNode);
+  visitor->trace(m_contentSettingsClient);
   WebFrame::traceFrames(visitor, this);
   WebFrameImplBase::trace(visitor);
 }