[WebLayer] Reload navigations on transient errors

This copies more of the logic from chrome's NetErrorHelper that deals
with auto-reload on failed navigations. This should prevent the error
page from showing up when changing from wifi->cellular. This logic is
copied for now so we can merge to M83.

Deduplicating this logic is tracked in crbug.com/1073624.

Bug: 1072453
Change-Id: If623a563e8748a598b9430716d145c92447257be
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2159800
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#761685}

weblayer/BUILD.gn

@@ -275,6 +275,7 @@ source_set("weblayer_lib_base") {
     "//components/crash/core/common",
     "//components/embedder_support",
     "//components/embedder_support/origin_trials",
+    "//components/error_page/common",
     "//components/find_in_page",
     "//components/infobars/core",
     "//components/keyed_service/content",

weblayer/browser/errorpage_browsertest.cc

@@ -5,7 +5,11 @@
 #include "weblayer/test/weblayer_browser_test.h"
 
 #include "base/macros.h"
+#include "base/test/bind_test_util.h"
+#include "base/test/scoped_feature_list.h"
+#include "content/public/test/url_loader_interceptor.h"
 #include "net/test/url_request/url_request_failed_job.h"
+#include "weblayer/common/features.h"
 #include "weblayer/shell/browser/shell.h"
 #include "weblayer/test/weblayer_browser_test_utils.h"
 
@@ -42,4 +46,51 @@ IN_PROC_BROWSER_TEST_F(ErrorPageBrowserTest, 404WithEmptyBody) {
   NavigateAndWaitForFailure(error_page_url, shell());
 }
 
+class ErrorPageReloadBrowserTest : public ErrorPageBrowserTest {
+ public:
+  ErrorPageReloadBrowserTest() {
+    feature_list_.InitAndEnableFeature(features::kEnableAutoReload);
+  }
+
+ private:
+  base::test::ScopedFeatureList feature_list_;
+};
+
+class MockNetworkChangeNotifier : public net::NetworkChangeNotifier {
+ public:
+  ConnectionType GetCurrentConnectionType() const override {
+    return net::NetworkChangeNotifier::CONNECTION_4G;
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(ErrorPageReloadBrowserTest, ReloadOnNetworkChanged) {
+  // Make sure the renderer thinks it's online, since that is a necessary
+  // condition for the reload.
+  net::NetworkChangeNotifier::DisableForTest disable;
+  MockNetworkChangeNotifier mock_notifier;
+
+  ASSERT_TRUE(embedded_test_server()->Start());
+  GURL url = embedded_test_server()->GetURL("/error_page");
+  // We send net::ERR_NETWORK_CHANGED on the first load, and the reload should
+  // get a net::OK response.
+  bool first_try = true;
+  content::URLLoaderInterceptor interceptor(base::BindLambdaForTesting(
+      [&url, &first_try](content::URLLoaderInterceptor::RequestParams* params) {
+        if (params->url_request.url == url) {
+          if (first_try) {
+            first_try = false;
+            params->client->OnComplete(
+                network::URLLoaderCompletionStatus(net::ERR_NETWORK_CHANGED));
+          } else {
+            content::URLLoaderInterceptor::WriteResponse(
+                "weblayer/test/data/simple_page.html", params->client.get());
+          }
+          return true;
+        }
+        return false;
+      }));
+
+  NavigateAndWaitForCompletion(url, shell());
+}
+
 }  // namespace weblayer

weblayer/common/features.cc

@@ -13,5 +13,9 @@ namespace features {
 const base::Feature kWebLayerSafeBrowsing{"WebLayerSafeBrowsing",
                                           base::FEATURE_ENABLED_BY_DEFAULT};
 
+// Enable auto-reload of error pages.
+const base::Feature kEnableAutoReload{"EnableAutoReload",
+                                      base::FEATURE_ENABLED_BY_DEFAULT};
+
 }  // namespace features
 }  // namespace weblayer

weblayer/common/features.h

@@ -13,6 +13,7 @@ namespace features {
 // Weblayer features in alphabetical order.
 
 extern const base::Feature kWebLayerSafeBrowsing;
+extern const base::Feature kEnableAutoReload;
 
 }  // namespace features
 }  // namespace weblayer

weblayer/renderer/DEPS

@@ -3,6 +3,7 @@ include_rules = [
   "+components/autofill/content/renderer",
   "+components/cdm/renderer",
   "+components/content_settings/renderer",
+  "+components/error_page/common",
   "+components/safe_browsing/content/common",
   "+components/safe_browsing/content/renderer",
   "+components/safe_browsing/core/common",
@@ -11,6 +12,7 @@ include_rules = [
   "+components/spellcheck/renderer",
   "+components/translate/content/renderer",
   "+components/translate/core/common",
+  "+content/public/common",
   "+content/public/renderer",
   # needed for safebrowsing
   "+mojo/public/cpp/bindings",

weblayer/renderer/content_renderer_client_impl.cc

@@ -9,6 +9,7 @@
 #include "components/autofill/content/renderer/autofill_agent.h"
 #include "components/autofill/content/renderer/password_autofill_agent.h"
 #include "components/content_settings/renderer/content_settings_agent_impl.h"
+#include "components/error_page/common/error.h"
 #include "content/public/renderer/render_thread.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "weblayer/common/features.h"
@@ -103,14 +104,28 @@ bool ContentRendererClientImpl::HasErrorPage(int http_status_code) {
   return http_status_code >= 400;
 }
 
+bool ContentRendererClientImpl::ShouldSuppressErrorPage(
+    content::RenderFrame* render_frame,
+    const GURL& url) {
+  auto* error_page_helper = ErrorPageHelper::GetForFrame(render_frame);
+  if (error_page_helper)
+    return error_page_helper->ShouldSuppressErrorPage();
+  return false;
+}
+
 void ContentRendererClientImpl::PrepareErrorPage(
     content::RenderFrame* render_frame,
     const blink::WebURLError& error,
     const std::string& http_method,
     std::string* error_html) {
-  auto* ssl_helper = ErrorPageHelper::GetForFrame(render_frame);
-  if (ssl_helper)
-    ssl_helper->PrepareErrorPage();
+  auto* error_page_helper = ErrorPageHelper::GetForFrame(render_frame);
+  if (error_page_helper) {
+    error_page_helper->PrepareErrorPage(
+        error_page::Error::NetError(error.url(), error.reason(),
+                                    error.resolve_error_info(),
+                                    error.has_copy_in_cache()),
+        http_method == "POST");
+  }
 
 #if defined(OS_ANDROID)
   android_system_error_page::PopulateErrorPageHtml(error, error_html);

weblayer/renderer/content_renderer_client_impl.h

@@ -28,6 +28,8 @@ class ContentRendererClientImpl : public content::ContentRendererClient {
   void RenderThreadStarted() override;
   void RenderFrameCreated(content::RenderFrame* render_frame) override;
   bool HasErrorPage(int http_status_code) override;
+  bool ShouldSuppressErrorPage(content::RenderFrame* render_frame,
+                               const GURL& url) override;
   void PrepareErrorPage(content::RenderFrame* render_frame,
                         const blink::WebURLError& error,
                         const std::string& http_method,