| Index: chrome/renderer/chrome_content_renderer_client.cc
|
| diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
|
| index d64dfbcddf6829ac0e46bb33786112d3ebdc482c..41ee39a28b0b29bb0d4b4c3d745f6e4f90c9bbd8 100644
|
| --- a/chrome/renderer/chrome_content_renderer_client.cc
|
| +++ b/chrome/renderer/chrome_content_renderer_client.cc
|
| @@ -984,6 +984,17 @@ bool ChromeContentRendererClient::HasErrorPage(int http_status_code,
|
| bool ChromeContentRendererClient::ShouldSuppressErrorPage(
|
| content::RenderFrame* render_frame,
|
| const GURL& url) {
|
| + // Unit tests for ChromeContentRendererClient pass a NULL RenderFrame here.
|
| + // Unfortunately it's very difficult to construct a mock RenderView, so skip
|
| + // this functionality in this case.
|
| + if (render_frame) {
|
| + content::RenderView* render_view = render_frame->GetRenderView();
|
| + content::RenderFrame* main_render_frame = render_view->GetMainRenderFrame();
|
| + blink::WebFrame* web_frame = render_frame->GetWebFrame();
|
| + NetErrorHelper* net_error_helper = NetErrorHelper::Get(main_render_frame);
|
| + if (net_error_helper->ShouldSuppressErrorPage(web_frame, url))
|
| + return true;
|
| + }
|
| // Do not flash an error page if the Instant new tab page fails to load.
|
| return search_bouncer_.get() && search_bouncer_->IsNewTabPage(url);
|
| }
|
|
|