New network error page: Fix resubmit warning page

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
===================================================================
--- chrome/renderer/chrome_content_renderer_client.cc	(revision 194125)
+++ chrome/renderer/chrome_content_renderer_client.cc	(working copy)
@@ -828,10 +828,6 @@
     string16* error_description) {
   const GURL failed_url = error.unreachableURL;
   const Extension* extension = NULL;
-  const bool is_repost =
-      error.reason == net::ERR_CACHE_MISS &&
-      error.domain == WebString::fromUTF8(net::kErrorDomain) &&
-      EqualsASCII(failed_request.httpMethod(), "POST");
 
   if (failed_url.is_valid() &&
       !failed_url.SchemeIs(extensions::kExtensionScheme)) {
@@ -839,6 +835,8 @@
         ExtensionURLInfo(failed_url));
   }
 
+  bool is_post = EqualsASCII(failed_request.httpMethod(), "POST");

[eroman, 2013/04/16 00:22:49]

Is this guaranteed to be upper case?

[mmenke, 2013/04/16 14:46:18]

Per RFC 2616, the method is actually case sensitive.  So if it's actually a
POST, either it violates spec, or it is guaranteed to be upper case.

+
   if (error_html) {
     // Use a local error page.
     int resource_id;
@@ -851,12 +849,11 @@
       // error messages?
       resource_id = IDR_ERROR_APP_HTML;
     } else {
-      if (is_repost) {
-        LocalizedError::GetFormRepostStrings(failed_url, &error_strings);
-      } else {
-        LocalizedError::GetStrings(error, &error_strings,
-                                   RenderThread::Get()->GetLocale());
-      }
+      LocalizedError::GetStrings(
+          error,
+          is_post,
+          RenderThread::Get()->GetLocale(),
+          &error_strings);
       resource_id = IDR_NET_ERROR_HTML;
     }
 
@@ -872,8 +869,8 @@
   }
 
   if (error_description) {
-    if (!extension && !is_repost)
-      *error_description = LocalizedError::GetErrorDetails(error);
+    if (!extension)
+      *error_description = LocalizedError::GetErrorDetails(error, is_post);
   }
 }