[Android WebView] Fix LoadsImagesAutomatically tests after crbug.com/224317

android_webview/renderer/aw_render_view_ext.cc

 // Copyright (c) 2012 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_render_view_ext.h"
 
 #include <string>
 
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/common/render_view_messages.h"
@@ skipping 149 matching lines @@
     if (webview) {
       WebKit::WebVector<WebKit::WebElement> images;
       webview->mainFrame()->document().images(images);
       hasImages = !images.isEmpty();
     }
   }
   Send(new AwViewHostMsg_DocumentHasImagesResponse(routing_id(), id,
                                                    hasImages));
 }
 
-bool AwRenderViewExt::allowImage(WebKit::WebFrame* frame,
-                                 bool enabled_per_settings,
-                                 const WebKit::WebURL& image_url) {

[abarth-chromium, 2013/06/13 18:20:10]

Oh, it's great that you don't need this override anymore.

[joth, 2013/06/14 00:25:25]

Hmmm I looked again, and I'm not sure we don't?
This functionality is used by setBlockNetworkImage which was not the subject of
this CL, is still supported (AFAIK) and is covered by the still existing (but
alas, disaled)  
testBlockNetworkImagesBlocksNetworkImageAndReloadInPlace test.

mnaganov - can you confirm this is not needed for AwSettings.setImagesEnabled()
?

-  // Implementing setBlockNetworkImages, so allow local scheme images to be
-  // loaded.
-  if (enabled_per_settings)
-    return true;
-
-  // For compatibility, only blacklist network schemes instead of whitelisting.
-  const GURL url(image_url);
-  return !(url.SchemeIs(chrome::kHttpScheme) ||
-           url.SchemeIs(chrome::kHttpsScheme) ||
-           url.SchemeIs(chrome::kFtpScheme));
-}
-
 void AwRenderViewExt::DidCommitProvisionalLoad(WebKit::WebFrame* frame,
                                                bool is_new_navigation) {
   content::DocumentState* document_state =
       content::DocumentState::FromDataSource(frame->dataSource());
   if (document_state->can_load_local_resources()) {
     WebKit::WebSecurityOrigin origin = frame->document().securityOrigin();
     origin.grantLoadLocalResources();
   }
 }
 
@@ skipping 74 matching lines @@
 }
 
 void AwRenderViewExt::OnSetInitialPageScale(double page_scale_factor) {
   if (!render_view() || !render_view()->GetWebView())
     return;
   render_view()->GetWebView()->setInitialPageScaleOverride(
       page_scale_factor);
 }
 
 }  // namespace android_webview