| Index: webkit/quota/quota_manager_unittest.cc
|
| diff --git a/webkit/quota/quota_manager_unittest.cc b/webkit/quota/quota_manager_unittest.cc
|
| index 87599ca86e855de947373dafd1166e4a5b5a31e4..e64edbb7ce4182f8dc754a3709d0849cc513e795 100644
|
| --- a/webkit/quota/quota_manager_unittest.cc
|
| +++ b/webkit/quota/quota_manager_unittest.cc
|
| @@ -924,7 +924,18 @@ TEST_F(QuotaManagerTest, GetCachedOrigins) {
|
| }
|
| }
|
|
|
| -TEST_F(QuotaManagerTest, NotifyAndLRUOrigin) {
|
| +#if defined(OS_WIN)
|
| +// http://crbug.com/83805. Time is too granular for the LRU tests on
|
| +// Windows, and a new version of SQLite is returning values in a
|
| +// different (implementation-defined and appropriate) order.
|
| +#define MAYBE_NotifyAndLRUOrigin DISABLED_NotifyAndLRUOrigin
|
| +#define MAYBE_GetLRUOriginWithOriginInUse DISABLED_GetLRUOriginWithOriginInUse
|
| +#else
|
| +#define MAYBE_NotifyAndLRUOrigin NotifyAndLRUOrigin
|
| +#define MAYBE_GetLRUOriginWithOriginInUse GetLRUOriginWithOriginInUse
|
| +#endif
|
| +
|
| +TEST_F(QuotaManagerTest, MAYBE_NotifyAndLRUOrigin) {
|
| static const MockOriginData kData[] = {
|
| { "http://a.com/", kStorageTypeTemporary, 0 },
|
| { "http://a.com:1/", kStorageTypeTemporary, 0 },
|
| @@ -963,7 +974,7 @@ TEST_F(QuotaManagerTest, NotifyAndLRUOrigin) {
|
| EXPECT_EQ("http://c.com/", lru_origin().spec());
|
| }
|
|
|
| -TEST_F(QuotaManagerTest, GetLRUOriginWithOriginInUse) {
|
| +TEST_F(QuotaManagerTest, MAYBE_GetLRUOriginWithOriginInUse) {
|
| static const MockOriginData kData[] = {
|
| { "http://a.com/", kStorageTypeTemporary, 0 },
|
| { "http://a.com:1/", kStorageTypeTemporary, 0 },
|
|
|