1 files changed, 35 insertions, 16 deletions

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/RepostFormWarningDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/RepostFormWarningDialog.java
index 0af541e..669a56f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/RepostFormWarningDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/RepostFormWarningDialog.java
@@ -10,7 +10,11 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
 
+import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.tab.EmptyTabObserver;
+import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.tab.TabObserver;
 
 /**
  * Form resubmission warning dialog. Presents the cancel/continue choice and fires one of two
@@ -20,18 +24,28 @@ public class RepostFormWarningDialog extends DialogFragment {
     // Warning dialog currently being shown, stored for testing.
     private static Dialog sCurrentDialog;
 
-    private final Runnable mCancelCallback;
-    private final Runnable mContinueCallback;
+    private final Tab mTab;
+    private final TabObserver mTabObserver;
 
     /** Empty constructor required for DialogFragments. */
     public RepostFormWarningDialog() {
-        mCancelCallback = null;
-        mContinueCallback = null;
+        mTab = null;
+        mTabObserver = null;
     }
 
-    public RepostFormWarningDialog(Runnable cancelCallback, Runnable continueCallback) {
-        mCancelCallback = cancelCallback;
-        mContinueCallback = continueCallback;
+    /**
+     * Handles the repost form warning for the given Tab.
+     * @param tab The tab waiting for confirmation on a repost form warning.
+     */
+    public RepostFormWarningDialog(Tab tab) {
+        mTab = tab;
+        mTabObserver = new EmptyTabObserver() {
+            @Override
+            public void onDestroyed(Tab tab) {
+                dismiss();
+            }
+        };
+        mTab.addObserver(mTabObserver);
     }
 
     @Override
@@ -52,27 +66,27 @@ public class RepostFormWarningDialog extends DialogFragment {
                 .setMessage(R.string.http_post_warning);
 
         if (savedInstanceState == null) {
-            assert mCancelCallback != null;
-            assert mContinueCallback != null;
+            assert mTab != null;
             builder.setNegativeButton(R.string.cancel,
                     new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int id) {
-                            mCancelCallback.run();
+                            if (!mTab.isInitialized()) return;
+                            mTab.getWebContents().getNavigationController().cancelPendingReload();
                         }
                     });
             builder.setPositiveButton(R.string.http_post_warning_resend,
                     new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int id) {
-                            mContinueCallback.run();
+                            if (!mTab.isInitialized()) return;
+                            mTab.getWebContents().getNavigationController().continuePendingReload();
                         }
                     });
         }
 
-        assert getCurrentDialog() == null;
         Dialog dialog = builder.create();
-        setCurrentDialog(dialog);
+        setCurrentDialogForTesting(dialog);
 
         return dialog;
     }
@@ -80,21 +94,26 @@ public class RepostFormWarningDialog extends DialogFragment {
     @Override
     public void onDismiss(DialogInterface dialog) {
         super.onDismiss(dialog);
-        setCurrentDialog(null);
+        setCurrentDialogForTesting(null);
+
+        if (mTab != null && mTabObserver != null) {
+            mTab.removeObserver(mTabObserver);
+        }
     }
 
     /**
      * Sets the currently displayed dialog in sCurrentDialog. This is required by findbugs, which
      * allows static fields only to be set from static methods.
      */
-    private static void setCurrentDialog(Dialog dialog) {
+    private static void setCurrentDialogForTesting(Dialog dialog) {
         sCurrentDialog = dialog;
     }
 
     /**
      * @return dialog currently being displayed.
      */
-    public static Dialog getCurrentDialog() {
+    @VisibleForTesting
+    public static Dialog getCurrentDialogForTesting() {
         return sCurrentDialog;
     }
 }