Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/web/WebLocalFrameImpl.h

Index: third_party/WebKit/Source/web/WebLocalFrameImpl.h
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.h b/third_party/WebKit/Source/web/WebLocalFrameImpl.h
index a57a15a315a8cac17f25fae0101c0bcc828b72de..ff4d704bbb3b226dc15ed553fb142fd88624bf38 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.h
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.h
@@ -51,6 +51,7 @@
 namespace blink {
 
 class ChromePrintContext;
+class ContentSettingsClient;
 class IntSize;
 class KURL;
 class ScrollableArea;
@@ -91,7 +92,6 @@ class WEB_EXPORT WebLocalFrameImpl final
   WebString assignedName() const override;
   void setName(const WebString&) override;
   WebVector<WebIconURL> iconURLs(int iconTypesMask) const override;
-  void setContentSettingsClient(WebContentSettingsClient*) override;
   void setSharedWorkerRepositoryClient(
       WebSharedWorkerRepositoryClient*) override;
   WebSize getScrollOffset() const override;
@@ -182,6 +182,7 @@ class WEB_EXPORT WebLocalFrameImpl final
   bool isSpellCheckingEnabled() const override;
   void replaceMisspelledRange(const WebString&) override;
   void removeSpellingMarkers() override;
+  void setContentSettingsClient(WebContentSettingsClient*) override;
   bool hasSelection() const override;
   WebRange selectionRange() const override;
   WebString selectionAsText() const override;
@@ -389,9 +390,10 @@ class WEB_EXPORT WebLocalFrameImpl final
   WebFrameClient* client() const { return m_client; }
   void setClient(WebFrameClient* client) { m_client = client; }
 
-  WebContentSettingsClient* contentSettingsClient() {
-    return m_contentSettingsClient;
+  ContentSettingsClient* contentSettingsClient() {
+    return m_contentSettingsClient.get();
   }
+
   SharedWorkerRepositoryClientImpl* sharedWorkerRepositoryClient() const {
     return m_sharedWorkerRepositoryClient.get();
   }
@@ -471,7 +473,7 @@ class WEB_EXPORT WebLocalFrameImpl final
 
   WebFrameClient* m_client;
   WebAutofillClient* m_autofillClient;
-  WebContentSettingsClient* m_contentSettingsClient;
+  Member<ContentSettingsClient> m_contentSettingsClient;
   std::unique_ptr<SharedWorkerRepositoryClientImpl>
       m_sharedWorkerRepositoryClient;