Accidentally enabled the wrong test.

Revert 100454 - Fix PrerenderBrowserTest.PrerenderInfiniteLoop flake due to process destruction/prerender contents destruction race.

TEST=PrerenderBrowserTest.PrerenderInfiniteLoop 
BUG=83170

Review URL: http://codereview.chromium.org/7787029

TBR=mmenke@chromium.org
Review URL: http://codereview.chromium.org/7862004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100457 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 8 deletions

diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index ceb6ec3..cdb5563 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -152,14 +152,8 @@ class TestPrerenderContents : public PrerenderContents {
     // before the PrerenderManager is destroyed.  As a result, it's possible to
     // get either FINAL_STATUS_APP_TERMINATING or FINAL_STATUS_RENDERER_CRASHED
     // on quit.
-    //
-    // It's also possible for this to be called after we've been notified of
-    // app termination, but before we've been deleted, which is why the second
-    // check is needed.
-    if (expected_final_status_ == FINAL_STATUS_APP_TERMINATING &&
-        final_status() != expected_final_status_) {
+    if (expected_final_status_ == FINAL_STATUS_APP_TERMINATING)
       expected_final_status_ = FINAL_STATUS_RENDERER_CRASHED;
-    }
 
     PrerenderContents::RenderViewGone();
   }
@@ -1095,7 +1089,8 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderInfiniteLoop) {
 // Checks that we don't prerender in an infinite loop and multiple links are
 // handled correctly.
 // Flaky, http://crbug.com/77323, but failing in a CHECK so disabled.
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderInfiniteLoopMultiple) {
+IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
+                       DISABLED_PrerenderInfiniteLoopMultiple) {
   const char* const kHtmlFileA =
       "files/prerender/prerender_infinite_a_multiple.html";
   const char* const kHtmlFileB =