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

android_webview/renderer/aw_permission_client.h

Index: android_webview/renderer/aw_permission_client.h
===================================================================
--- android_webview/renderer/aw_permission_client.h	(revision 260883)
+++ android_webview/renderer/aw_permission_client.h	(working copy)
@@ -20,6 +20,7 @@
   virtual ~AwPermissionClient();
 
   // blink::WebPermissionClient implementation.
+  // TODO(jam): remove all these methods after Blink rolls.
   virtual bool allowDisplayingInsecureContent(
       blink::WebFrame* frame,
       bool enabled_per_settings,
@@ -31,6 +32,15 @@
       const blink::WebSecurityOrigin& origin,
       const blink::WebURL& url) OVERRIDE;
 
+  virtual bool allowDisplayingInsecureContent(
+      bool enabled_per_settings,
+      const blink::WebSecurityOrigin& origin,
+      const blink::WebURL& url) OVERRIDE;
+  virtual bool allowRunningInsecureContent(
+      bool enabled_per_settings,
+      const blink::WebSecurityOrigin& origin,
+      const blink::WebURL& url) OVERRIDE;
+
   DISALLOW_COPY_AND_ASSIGN(AwPermissionClient);
 };