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

android_webview/renderer/aw_permission_client.cc

Index: android_webview/renderer/aw_permission_client.cc
===================================================================
--- android_webview/renderer/aw_permission_client.cc	(revision 260883)
+++ android_webview/renderer/aw_permission_client.cc	(working copy)
@@ -37,7 +37,7 @@
       bool enabled_per_settings,
       const blink::WebSecurityOrigin& origin,
       const blink::WebURL& url) {
-  return enabled_per_settings ? true : AllowMixedContent(url);
+  return allowDisplayingInsecureContent(enabled_per_settings, origin, url);
 }
 
 bool AwPermissionClient::allowRunningInsecureContent(
@@ -45,7 +45,21 @@
       bool enabled_per_settings,
       const blink::WebSecurityOrigin& origin,
       const blink::WebURL& url) {
+  return allowRunningInsecureContent(enabled_per_settings, origin, url);
+}
+
+bool AwPermissionClient::allowDisplayingInsecureContent(
+      bool enabled_per_settings,
+      const blink::WebSecurityOrigin& origin,
+      const blink::WebURL& url) {
   return enabled_per_settings ? true : AllowMixedContent(url);
 }
 
+bool AwPermissionClient::allowRunningInsecureContent(
+      bool enabled_per_settings,
+      const blink::WebSecurityOrigin& origin,
+      const blink::WebURL& url) {
+  return enabled_per_settings ? true : AllowMixedContent(url);
+}
+
 }  // namespace android_webview