Fixed flaky SadTabReloadButton test

chrome/android/javatests/src/org/chromium/chrome/browser/tab/SadTabTest.java

 // Copyright 2015 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.
 
 package org.chromium.chrome.browser.tab;
 
 import android.test.suitebuilder.annotation.SmallTest;
 import android.widget.Button;
 
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 
 /**
  * Tests related to the sad tab logic.
  */
 @RetryOnFailure
@@ skipping 30 matching lines @@
     public void testSadTabNotShownWhenRendererProcessKilledInBackround() {
         final Tab tab = getActivity().getActivityTab();
 
         assertFalse(tab.isShowingSadTab());
         simulateRendererKilled(tab, false);
         assertFalse(tab.isShowingSadTab());
     }
 
     /**
      * Confirm that after a successive refresh of a failed tab that failed to load, change the
-     * button from "Reload" to "Send Feedback".
+     * button from "Reload" to "Send Feedback". If reloaded a third time and it is successful it
+     * reverts from "Send Feedback" to "Reload".
+     * @throws InterruptedException
+     * @throws IllegalArgumentException
      */
     @SmallTest
     @Feature({"SadTab"})
-    @DisabledTest(message = "crbug.com/670920")
-    public void testChangeSadButtonToFeedbackAfterFailedRefresh() {
+    public void testSadTabPageButtonText() throws IllegalArgumentException, InterruptedException {
         final Tab tab = getActivity().getActivityTab();
 
         assertFalse(tab.isShowingSadTab());
         simulateRendererKilled(tab, true);
         assertTrue(tab.isShowingSadTab());
         String actualText = getSadTabButton(tab).getText().toString();
         assertEquals("Expected the sad tab button to have the reload label",
                 getActivity().getString(R.string.sad_tab_reload_label), actualText);
 
         reloadSadTab(tab);
         assertTrue(tab.isShowingSadTab());
         actualText = getSadTabButton(tab).getText().toString();
         assertEquals(
                 "Expected the sad tab button to have the feedback label after the tab button "
                 + "crashes twice in a row.",
                 getActivity().getString(R.string.sad_tab_send_feedback_label), actualText);
+        loadUrl("about:blank");
+        assertFalse("Expected about:blank to destroy the sad tab however the sad tab is still in "
+                + "view", tab.isShowingSadTab());
+        simulateRendererKilled(tab, true);
+        actualText = getSadTabButton(tab).getText().toString();
+        assertEquals("Expected the sad tab button to have the reload label after a successful load",
+                getActivity().getString(R.string.sad_tab_reload_label), actualText);
     }
 
     /**
-     * Confirm after two failures, if we refresh a third time and it's successful, and then we
-     * crash again, we do not show the "Send Feedback" button and instead show the "Reload" tab.
-     */
-    @SmallTest
-    @Feature({"SadTab"})
-    @DisabledTest(message = "crbug.com/670920")
-    public void testSadButtonRevertsBackToReloadAfterSuccessfulLoad() {
-        final Tab tab = getActivity().getActivityTab();
-
-        simulateRendererKilled(tab, true);
-        reloadSadTab(tab);
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                tab.reload(); // Erases the sad tab page
-                tab.didFinishPageLoad(); // Resets the tab counter to 0
-            }
-        });
-        simulateRendererKilled(tab, true);
-        String actualText = getSadTabButton(tab).getText().toString();
-        assertEquals(getActivity().getString(R.string.sad_tab_reload_label), actualText);
-    }
-
-    /**
      * Helper method that kills the renderer on a UI thread.
      */
     private void simulateRendererKilled(final Tab tab, final boolean wasOomProtected) {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 tab.simulateRendererKilledForTesting(wasOomProtected);
             }
         });
     }
@@ skipping 15 matching lines @@
      * @param tab The tab that needs to contain a SadTabView.
      * @return Returns the button that is on the SadTabView, null if SadTabView.
      *         doesn't exist.
      */
     private Button getSadTabButton(Tab tab) {
         return (Button) tab.getContentViewCore().getContainerView()
                 .findViewById(R.id.sad_tab_reload_button);
     }
 
 }