diff options
Diffstat (limited to 'net/cookies/cookie_monster_unittest.cc')
| -rw-r--r-- | net/cookies/cookie_monster_unittest.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc index d2706a5..e7e3582 100644 --- a/net/cookies/cookie_monster_unittest.cc +++ b/net/cookies/cookie_monster_unittest.cc @@ -2076,7 +2076,15 @@ TEST_F(CookieMonsterTest, CookieListOrdering) { // get rid of cookies when we should). The perftest is probing for // whether garbage collection happens when it shouldn't. See comments // before that test for more details. -TEST_F(CookieMonsterTest, GarbageCollectionTriggers) { + +// Disabled on Windows, see crbug.com/126095 +#if defined(OS_WIN) +#define MAYBE_GarbageCollectionTriggers DISABLED_GarbageCollectionTriggers +#else +#define MAYBE_GarbageCollectionTriggers GarbageCollectionTriggers +#endif + +TEST_F(CookieMonsterTest, MAYBE_GarbageCollectionTriggers) { // First we check to make sure that a whole lot of recent cookies // doesn't get rid of anything after garbage collection is checked for. { |