Chrome side changes to removing WebFrame parameter from WebPermissionClient, since it's redundant n…

content/shell/renderer/test_runner/WebPermissions.h

Index: content/shell/renderer/test_runner/WebPermissions.h
===================================================================
--- content/shell/renderer/test_runner/WebPermissions.h	(revision 260883)
+++ content/shell/renderer/test_runner/WebPermissions.h	(working copy)
@@ -18,6 +18,7 @@
     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 @@
     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);