Chrome side changes to removing WebFrame parameter from WebPermissionClient, since it's redundant now.

BUG=304341
R=nasko@chromium.org

Review URL: https://codereview.chromium.org/216983003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261136 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 43 insertions, 5 deletions

diff --git a/content/shell/renderer/test_runner/WebPermissions.cpp b/content/shell/renderer/test_runner/WebPermissions.cpp
index 6837172..1eec6eb 100644
--- a/content/shell/renderer/test_runner/WebPermissions.cpp
+++ b/content/shell/renderer/test_runner/WebPermissions.cpp
@@ -25,13 +25,43 @@ WebPermissions::~WebPermissions()
 
 bool WebPermissions::allowImage(blink::WebFrame*, bool enabledPerSettings, const blink::WebURL& imageURL)
 {
+    return allowImage(enabledPerSettings, imageURL);
+}
+
+bool WebPermissions::allowScriptFromSource(blink::WebFrame*, bool enabledPerSettings, const blink::WebURL& scriptURL)
+{
+    return allowScriptFromSource(enabledPerSettings, scriptURL);
+}
+
+bool WebPermissions::allowStorage(blink::WebFrame*, bool temp)
+{
+    return allowStorage(temp);
+}
+
+bool WebPermissions::allowPlugins(blink::WebFrame*, bool enabledPerSettings)
+{
+    return enabledPerSettings && m_pluginsAllowed;
+}
+
+bool WebPermissions::allowDisplayingInsecureContent(blink::WebFrame*, bool enabledPerSettings, const blink::WebSecurityOrigin& temp1, const blink::WebURL& temp2)
+{
+    return allowDisplayingInsecureContent(enabledPerSettings, temp1, temp2);
+}
+
+bool WebPermissions::allowRunningInsecureContent(blink::WebFrame*, bool enabledPerSettings, const blink::WebSecurityOrigin& temp1, const blink::WebURL& temp2)
+{
+    return allowRunningInsecureContent(enabledPerSettings, temp1, temp2);
+}
+
+bool WebPermissions::allowImage(bool enabledPerSettings, const blink::WebURL& imageURL)
+{
     bool allowed = enabledPerSettings && m_imagesAllowed;
     if (m_dumpCallbacks && m_delegate)
         m_delegate->printMessage(std::string("PERMISSION CLIENT: allowImage(") + normalizeLayoutTestURL(imageURL.spec()) + "): " + (allowed ? "true" : "false") + "\n");
     return allowed;
 }
 
-bool WebPermissions::allowScriptFromSource(blink::WebFrame*, bool enabledPerSettings, const blink::WebURL& scriptURL)
+bool WebPermissions::allowScriptFromSource(bool enabledPerSettings, const blink::WebURL& scriptURL)
 {
     bool allowed = enabledPerSettings && m_scriptsAllowed;
     if (m_dumpCallbacks && m_delegate)
@@ -39,22 +69,22 @@ bool WebPermissions::allowScriptFromSource(blink::WebFrame*, bool enabledPerSett
     return allowed;
 }
 
-bool WebPermissions::allowStorage(blink::WebFrame*, bool)
+bool WebPermissions::allowStorage(bool)
 {
     return m_storageAllowed;
 }
 
-bool WebPermissions::allowPlugins(blink::WebFrame*, bool enabledPerSettings)
+bool WebPermissions::allowPlugins(bool enabledPerSettings)
 {
     return enabledPerSettings && m_pluginsAllowed;
 }
 
-bool WebPermissions::allowDisplayingInsecureContent(blink::WebFrame*, bool enabledPerSettings, const blink::WebSecurityOrigin&, const blink::WebURL&)
+bool WebPermissions::allowDisplayingInsecureContent(bool enabledPerSettings, const blink::WebSecurityOrigin&, const blink::WebURL&)
 {
     return enabledPerSettings || m_displayingInsecureContentAllowed;
 }
 
-bool WebPermissions::allowRunningInsecureContent(blink::WebFrame*, bool enabledPerSettings, const blink::WebSecurityOrigin&, const blink::WebURL&)
+bool WebPermissions::allowRunningInsecureContent(bool enabledPerSettings, const blink::WebSecurityOrigin&, const blink::WebURL&)
 {
     return enabledPerSettings || m_runningInsecureContentAllowed;
 }
diff --git a/content/shell/renderer/test_runner/WebPermissions.h b/content/shell/renderer/test_runner/WebPermissions.h
index fbadff5..724dc589 100644
--- a/content/shell/renderer/test_runner/WebPermissions.h
+++ b/content/shell/renderer/test_runner/WebPermissions.h
@@ -18,6 +18,7 @@ public:
     virtual ~WebPermissions();
 
     // Override WebPermissionClient methods.
+    // TODO(jam): remove all these methods after Blink rolls.
     virtual bool allowImage(blink::WebFrame*, bool enabledPerSettings, const blink::WebURL& imageURL);
     virtual bool allowScriptFromSource(blink::WebFrame*, bool enabledPerSettings, const blink::WebURL& scriptURL);
     virtual bool allowStorage(blink::WebFrame*, bool local);
@@ -25,6 +26,13 @@ public:
     virtual bool allowDisplayingInsecureContent(blink::WebFrame*, bool enabledPerSettings, const blink::WebSecurityOrigin&, const blink::WebURL&);
     virtual bool allowRunningInsecureContent(blink::WebFrame*, bool enabledPerSettings, const blink::WebSecurityOrigin&, const blink::WebURL&);
 
+    virtual bool allowImage(bool enabledPerSettings, const blink::WebURL& imageURL);
+    virtual bool allowScriptFromSource(bool enabledPerSettings, const blink::WebURL& scriptURL);
+    virtual bool allowStorage(bool local);
+    virtual bool allowPlugins(bool enabledPerSettings);
+    virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, const blink::WebSecurityOrigin&, const blink::WebURL&);
+    virtual bool allowRunningInsecureContent(bool enabledPerSettings, const blink::WebSecurityOrigin&, const blink::WebURL&);
+
     // Hooks to set the different policies.
     void setImagesAllowed(bool);
     void setScriptsAllowed(bool);