Merge M54: Load live version when reloading an offline page on connected network

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java

Index: chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java
index b36430795a25752004fbbcda18d393d7e846b610..92d1bb0256a5e2b0006cb30d8016bb8d54cdbc36 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java
@@ -32,11 +32,9 @@ import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.components.bookmarks.BookmarkId;
 import org.chromium.components.offlinepages.SavePageResult;
-import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.net.ConnectionType;
 import org.chromium.net.NetworkChangeNotifier;
-import org.chromium.ui.base.PageTransition;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -218,10 +216,9 @@ public class OfflinePageUtils {
                 RecordUserAction.record("OfflinePages.ReloadButtonClicked");
                 Tab foundTab = tabModelSelector.getTabById(tabId);
                 if (foundTab == null) return;
-
-                LoadUrlParams params =
-                        new LoadUrlParams(foundTab.getOriginalUrl(), PageTransition.RELOAD);
-                foundTab.loadUrl(params);
+                // Delegates to Tab to reload the page. Tab will send the correct header in order to
+                // load the right page.
+                foundTab.reload();
             }
 
             @Override
@@ -541,6 +538,17 @@ public class OfflinePageUtils {
         }.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
     }
 
+    /**
+     * Retrieves the extra request header to reload the offline page.
+     * @param tab The current tab.
+     * @return The extra request header string.
+     */
+    public static String getOfflinePageHeaderForReload(Tab tab) {
+        OfflinePageBridge offlinePageBridge = getInstance().getOfflinePageBridge(tab.getProfile());
+        if (offlinePageBridge == null) return "";
+        return offlinePageBridge.getOfflinePageHeaderForReload(tab.getWebContents());
+    }
+
     private static boolean isPowerConnected(Intent batteryStatus) {
         int status = batteryStatus.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
         boolean isConnected = (status == BatteryManager.BATTERY_STATUS_CHARGING