Merge to M56: Do not show "DOWNLOAD PAGE LATER" button if RELOAD button is shown

components/error_page/common/localized_error.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 "components/error_page/common/localized_error.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 927 matching lines @@
     search_suggestion->SetString("searchUrl", params->search_url.spec() +
                                  params->search_terms);
     search_suggestion->SetString("searchTerms", params->search_terms);
     search_suggestion->SetInteger("trackingId",
                                   params->search_tracking_id);
     suggestions_summary_list->Append(std::move(search_suggestion));
   }
 
   // Add the reload suggestion, if needed for pages that didn't come
   // from a post.
+#if defined(OS_ANDROID)
+  bool reload_visible = false;
+#endif  // defined(OS_ANDROID)
   if (params->suggest_reload && !is_post) {
+#if defined(OS_ANDROID)
+    reload_visible = true;
+#endif  // defined(OS_ANDROID)
     base::DictionaryValue* reload_button = new base::DictionaryValue;
     reload_button->SetString(
         "msg", l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_RELOAD));
     reload_button->SetString("reloadUrl", failed_url.spec());
     error_strings->Set("reloadButton", reload_button);
     reload_button->SetInteger("reloadTrackingId", params->reload_tracking_id);
   }
 
   // If not using the default suggestions, nothing else to do.
   if (!use_default_suggestions)
@@ skipping 32 matching lines @@
             IDS_ERRORPAGES_BUTTON_SHOW_SAVED_COPY));
     show_saved_copy_button->SetString(
         "title",
         l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_SHOW_SAVED_COPY_HELP));
     if (show_saved_copy_primary)
       show_saved_copy_button->SetString("primary", "true");
     error_strings->Set("showSavedCopyButton", show_saved_copy_button);
   }
 
 #if defined(OS_ANDROID)
-  if (!show_saved_copy_visible && !is_incognito &&
-      failed_url.SchemeIsHTTPOrHTTPS() &&
+  if (!reload_visible && !show_saved_copy_visible && !is_incognito &&
+      failed_url.is_valid() && failed_url.SchemeIsHTTPOrHTTPS() &&
       offline_pages::IsOfflinePagesAsyncDownloadEnabled()) {
     std::unique_ptr<base::DictionaryValue> download_button =
         base::MakeUnique<base::DictionaryValue>();
     download_button->SetString(
         "msg",
         l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_DOWNLOAD));
     download_button->SetString(
         "disabledMsg",
         l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_DOWNLOADING));
     error_strings->Set("downloadButton", std::move(download_button));
@@ skipping 14 matching lines @@
 
 bool LocalizedError::HasStrings(const std::string& error_domain,
                                 int error_code) {
   // Whether or not the there are strings for an error does not depend on
   // whether or not the page was be generated by a POST, so just claim it was
   // not.
   return LookupErrorMap(error_domain, error_code, /*is_post=*/false) != nullptr;
 }
 
 }  // namespace error_page