diff options
| author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-28 15:00:52 +0000 |
|---|---|---|
| committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-28 15:00:52 +0000 |
| commit | 083b4354f6b14188bf4358642465532cec418f45 (patch) | |
| tree | b30749847980c06876a51fca0dc90bdbea221cbf /chrome/browser/safe_browsing | |
| parent | 53fb8aaa9fb111a0f843ecfb394377789f6a2ac9 (diff) | |
| download | chromium_src-083b4354f6b14188bf4358642465532cec418f45.zip chromium_src-083b4354f6b14188bf4358642465532cec418f45.tar.gz chromium_src-083b4354f6b14188bf4358642465532cec418f45.tar.bz2 | |
Fix flakiness of SafeBrowsingServiceTest.Prefetch.
BUG=80719
TEST=SafeBrowsingServiceTest.Prefetch
Review URL: http://codereview.chromium.org/6893069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing')
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index b734071..6c49d54 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc @@ -11,6 +11,7 @@ #include "base/metrics/histogram.h" #include "crypto/sha2.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/safe_browsing/safe_browsing_database.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" @@ -394,23 +395,27 @@ const char kPrefetchMalwarePage[] = "files/safe_browsing/prefetch_malware.html"; // This test confirms that prefetches don't themselves get the // interstitial treatment. -// FLAKY: http://crbug.com/80719 -IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, FLAKY_Prefetch) { +IN_PROC_BROWSER_TEST_F(SafeBrowsingServiceTest, Prefetch) { GURL url = test_server()->GetURL(kPrefetchMalwarePage); GURL malware_url = test_server()->GetURL(kMalwarePage); class SetPrefetchForTest { public: explicit SetPrefetchForTest(bool prefetch) - : old_prefetch_state_(ResourceDispatcherHost::is_prefetch_enabled()) { + : old_prefetch_state_(ResourceDispatcherHost::is_prefetch_enabled()), + old_prerender_mode_(prerender::PrerenderManager::GetMode()) { ResourceDispatcherHost::set_is_prefetch_enabled(prefetch); + prerender::PrerenderManager::SetMode( + prerender::PrerenderManager::PRERENDER_MODE_DISABLED); } ~SetPrefetchForTest() { ResourceDispatcherHost::set_is_prefetch_enabled(old_prefetch_state_); + prerender::PrerenderManager::SetMode(old_prerender_mode_); } private: bool old_prefetch_state_; + prerender::PrerenderManager::PrerenderManagerMode old_prerender_mode_; } set_prefetch_for_test(true); // Even though we have added this uri to the safebrowsing database and |