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

android_webview/renderer/aw_permission_client.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/renderer/aw_permission_client.h"
 
 #include "content/public/renderer/render_frame.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "url/gurl.h"
@@ skipping 19 matching lines @@
 }
 
 AwPermissionClient::~AwPermissionClient() {
 }
 
 bool AwPermissionClient::allowDisplayingInsecureContent(
       blink::WebFrame* frame,
       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(
       blink::WebFrame* frame,
       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