[Offline Pages on the NTP] Bypass the network interstitial

chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
index 08fef9539566316883599a427a7d84b638069331..bf228133f01b8ab7dfe6df88cb172db77e3ce3bc 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
@@ -47,6 +47,7 @@ import org.chromium.chrome.browser.ntp.NewTabPageView.NewTabPageManager;
 import org.chromium.chrome.browser.ntp.interests.InterestsPage;
 import org.chromium.chrome.browser.ntp.interests.InterestsPage.InterestsClickListener;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
+import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
 import org.chromium.chrome.browser.preferences.DocumentModeManager;
 import org.chromium.chrome.browser.preferences.DocumentModePreference;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
@@ -335,6 +336,13 @@ public class NewTabPage
 
         @Override
         public void open(String url) {
+            if (!mIsDestroyed && isNtpOfflinePagesEnabled()) {

[newt (away), 2016/01/14 18:27:11]

I'd changed the first line to "if (mIsDestroyed) return;". If this object has
been destroyed, it's fine for it to ignore open() requests.

[Marc Treib, 2016/01/15 13:27:35]

Done.

+                if (mOfflinePageBridge == null) {
+                    mOfflinePageBridge = new OfflinePageBridge(mProfile);
+                }
+                url = OfflinePageUtils.getOfflineUrlIfNecessary(

[fgorski, 2016/01/14 18:44:06]

rename to getLaunchUrlFromOnlineUrl

[Marc Treib, 2016/01/15 13:27:34]

Done.

+                        mNewTabPageView.getContext(), mOfflinePageBridge, url);
+            }
             mTab.loadUrl(new LoadUrlParams(url, PageTransition.AUTO_BOOKMARK));
         }
 
@@ -454,7 +462,7 @@ public class NewTabPage
         public boolean isOfflineAvailable(String pageUrl) {
             if (mIsDestroyed || !isNtpOfflinePagesEnabled()) return false;
             if (mOfflinePageBridge == null) mOfflinePageBridge = new OfflinePageBridge(mProfile);
-            return mOfflinePageBridge.getPageByOnlineURL(pageUrl) != null;
+            return mOfflinePageBridge.getOfflineUrlForOnlineUrl(pageUrl) != null;
         }
 
         @Override