summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 08:51:31 +0000
committernona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 08:51:31 +0000
commit4f0501b5849de6f8b4cadc6d91b9419abd4582c3 (patch)
tree3cb1961c0bfbd31861e9874cb9c0b82aa46bab1e
parent6174546c79e10140ee1848400cc52a5d5729a05e (diff)
downloadchromium_src-4f0501b5849de6f8b4cadc6d91b9419abd4582c3.zip
chromium_src-4f0501b5849de6f8b4cadc6d91b9419abd4582c3.tar.gz
chromium_src-4f0501b5849de6f8b4cadc6d91b9419abd4582c3.tar.bz2
Disable PrerenderBrowserTest.PrerenderSessionStorage again
BUG=161988 TEST=None NOTRY=true TBR=avi@chromium.org Review URL: https://chromiumcodereview.appspot.com/11412126 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169007 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/prerender/prerender_browsertest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 67ddad43..ef2b609 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -2377,7 +2377,13 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest,
// Validate that the sessionStorage namespace remains the same when swapping
// in a prerendered page.
-IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSessionStorage) {
+#if defined(OS_WIN)
+// http://crbug.com/161988 - DCHECK failed on Win7 Tests dbg (2)
+#define MAYBE_PrerenderSessionStorage DISABLED_PrerenderSessionStorage
+#else
+#define MAYBE_PrerenderSessionStorage PrerenderSessionStorage
+#endif
+IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderSessionStorage) {
set_loader_path("files/prerender/prerender_loader_with_session_storage.html");
PrerenderTestURL(GetCrossDomainTestUrl("files/prerender/prerender_page.html"),
FINAL_STATUS_USED,