Unflake PrerenderOmniboxBrowserTest.PrerenderOmniboxAbandon.

chrome/browser/prerender/prerender_browsertest.cc

 // Copyright (c) 2012 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.
 
 #include <deque>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 4362 matching lines @@
   // Fake an omnibox prerender.
   scoped_ptr<TestPrerender> prerender = StartOmniboxPrerender(
       test_server()->GetURL("files/empty.html"),
       FINAL_STATUS_CANCELLED);
 
   // Revert the location bar. This should cancel the prerender.
   GetLocationBar()->Revert();
   prerender->WaitForStop();
 }
 
-// Checks that closing the omnibox popup cancels an omnibox prerender.
-// Disabled: flaky on all platforms. See http://crbug.com/368721.
-IN_PROC_BROWSER_TEST_F(PrerenderOmniboxBrowserTest,
-                       DISABLED_PrerenderOmniboxAbandon) {
+// Checks that accepting omnibox input abandons an omnibox prerender.
+IN_PROC_BROWSER_TEST_F(PrerenderOmniboxBrowserTest, PrerenderOmniboxAbandon) {
   // Set the abandon timeout to something high so it does not introduce
   // flakiness if the prerender times out before the test completes.
   GetPrerenderManager()->mutable_config().abandon_time_to_live =
       base::TimeDelta::FromDays(999);
 
   // Ensure the cookie store has been loaded.
   if (!GetPrerenderManager()->cookie_store_loaded()) {
     base::RunLoop loop;
     GetPrerenderManager()->set_on_cookie_store_loaded_cb_for_testing(
         loop.QuitClosure());
     loop.Run();
   }
 
   // Enter a URL into the Omnibox.
   OmniboxView* omnibox_view = GetOmniboxView();
   omnibox_view->OnBeforePossibleChange();
   omnibox_view->SetUserText(
       base::UTF8ToUTF16(test_server()->GetURL("files/empty.html?1").spec()));
   omnibox_view->OnAfterPossibleChange();
   WaitForAutocompleteDone(omnibox_view);
 
   // Fake an omnibox prerender for a different URL.
   scoped_ptr<TestPrerender> prerender = StartOmniboxPrerender(
       test_server()->GetURL("files/empty.html?2"),
       FINAL_STATUS_APP_TERMINATING);
 
+  // The final status may be either FINAL_STATUS_APP_TERMINATING or
+  // FINAL_STATUS_CANCELLED. Although closing the omnibox will not cancel an
+  // abandoned prerender, the AutocompleteActionPredictor will cancel the
+  // predictor on destruction.
+  prerender->contents()->set_skip_final_checks(true);
+
   // Navigate to the URL entered.
   omnibox_view->model()->AcceptInput(CURRENT_TAB, false);
 
   // Prerender should be running, but abandoned.
   EXPECT_TRUE(
       GetAutocompleteActionPredictor()->IsPrerenderAbandonedForTesting());
 }
 
 }  // namespace prerender