Switch ContentSettingsObserver to be a RenderFrameObserver instead of a RenderViewObserver

android_webview/renderer/aw_render_view_ext.cc

Index: android_webview/renderer/aw_render_view_ext.cc
===================================================================
--- android_webview/renderer/aw_render_view_ext.cc	(revision 241294)
+++ android_webview/renderer/aw_render_view_ext.cc	(working copy)
@@ -37,15 +37,6 @@
 
 namespace {
 
-bool AllowMixedContent(const blink::WebURL& url) {
-  // We treat non-standard schemes as "secure" in the WebView to allow them to
-  // be used for request interception.
-  // TODO(benm): Tighten this restriction by requiring embedders to register
-  // their custom schemes? See b/9420953.
-  GURL gurl(url);
-  return !gurl.IsStandard();
-}
-
 GURL GetAbsoluteUrl(const blink::WebNode& node, const string16& url_fragment) {
   return GURL(node.document().completeURL(url_fragment));
 }
@@ -145,7 +136,6 @@
 
 AwRenderViewExt::AwRenderViewExt(content::RenderView* render_view)
     : content::RenderViewObserver(render_view), page_scale_factor_(0.0f) {
-  render_view->GetWebView()->setPermissionClient(this);
 }
 
 AwRenderViewExt::~AwRenderViewExt() {
@@ -186,22 +176,6 @@
                                                    hasImages));
 }
 
-bool AwRenderViewExt::allowDisplayingInsecureContent(
-      blink::WebFrame* frame,
-      bool enabled_per_settings,
-      const blink::WebSecurityOrigin& origin,
-      const blink::WebURL& url) {
-  return enabled_per_settings ? true : AllowMixedContent(url);
-}
-
-bool AwRenderViewExt::allowRunningInsecureContent(
-      blink::WebFrame* frame,
-      bool enabled_per_settings,
-      const blink::WebSecurityOrigin& origin,
-      const blink::WebURL& url) {
-  return enabled_per_settings ? true : AllowMixedContent(url);
-}
-
 void AwRenderViewExt::DidCommitProvisionalLoad(blink::WebFrame* frame,
                                                bool is_new_navigation) {
   content::DocumentState* document_state =