Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/core/frame/LocalFrameClient.h

Index: third_party/WebKit/Source/core/frame/LocalFrameClient.h
diff --git a/third_party/WebKit/Source/core/frame/LocalFrameClient.h b/third_party/WebKit/Source/core/frame/LocalFrameClient.h
index d6391756963d0dac7756c2600ee7bb48c10fabc8..0a05fd01b316f44bce2ba23b031a8cd5297f5404 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrameClient.h
+++ b/third_party/WebKit/Source/core/frame/LocalFrameClient.h
@@ -234,39 +234,6 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
   virtual void didChangeScrollOffset() {}
   virtual void didUpdateCurrentHistoryItem() {}
 
-  virtual bool allowScript(bool enabledPerSettings) {
-    return enabledPerSettings;
-  }
-  virtual bool allowScriptFromSource(bool enabledPerSettings, const KURL&) {
-    return enabledPerSettings;
-  }
-  virtual bool allowPlugins(bool enabledPerSettings) {
-    return enabledPerSettings;
-  }
-  virtual bool allowImage(bool enabledPerSettings, const KURL&) {
-    return enabledPerSettings;
-  }
-  virtual bool allowRunningInsecureContent(bool enabledPerSettings,
-                                           SecurityOrigin*,
-                                           const KURL&) {
-    return enabledPerSettings;
-  }
-  virtual bool allowAutoplay(bool defaultValue) { return defaultValue; }
-
-  // Reports that passive mixed content was found at the provided URL. It may or
-  // may not be actually displayed later, what would be flagged by
-  // didDisplayInsecureContent.
-  virtual void passiveInsecureContentFound(const KURL&) {}
-
-  // This callback notifies the client that the frame was about to run
-  // JavaScript but did not because allowScript returned false. We have a
-  // separate callback here because there are a number of places that need to
-  // know if JavaScript is enabled but are not necessarily preparing to execute
-  // script.
-  virtual void didNotAllowScript() {}
-  // This callback is similar, but for plugins.
-  virtual void didNotAllowPlugins() {}
-
   virtual WebCookieJar* cookieJar() const = 0;
 
   virtual void didChangeName(const String&) {}
@@ -303,6 +270,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
   virtual std::unique_ptr<WebServiceWorkerProvider>
   createServiceWorkerProvider() = 0;
 
+  virtual ContentSettingsClient* contentSettingsClient() = 0;

[dcheng, 2017/04/02 05:26:19]

Can we make this return a reference?

[kinuko, 2017/04/03 15:15:06]

Done.

+
   virtual SharedWorkerRepositoryClient* sharedWorkerRepositoryClient() {
     return 0;
   }