diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/webkit/browser/appcache/appcache_database_unittest.cc | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/webkit/browser/appcache/appcache_database_unittest.cc')
| -rw-r--r-- | chromium/webkit/browser/appcache/appcache_database_unittest.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chromium/webkit/browser/appcache/appcache_database_unittest.cc b/chromium/webkit/browser/appcache/appcache_database_unittest.cc index e67a68dafdb..9dc90808fec 100644 --- a/chromium/webkit/browser/appcache/appcache_database_unittest.cc +++ b/chromium/webkit/browser/appcache/appcache_database_unittest.cc @@ -668,6 +668,9 @@ TEST(AppCacheDatabaseTest, OriginUsage) { EXPECT_EQ(5000, usage_map[kOtherOrigin]); } +#if defined(APPCACHE_USE_SIMPLE_CACHE) +// There is no such upgrade path in this case. +#else TEST(AppCacheDatabaseTest, UpgradeSchema3to5) { // Real file on disk for this test. base::ScopedTempDir temp_dir; @@ -886,7 +889,11 @@ TEST(AppCacheDatabaseTest, UpgradeSchema3to5) { EXPECT_FALSE(fallbacks[i].namespace_.is_pattern); } } +#endif // !APPCACHE_USE_SIMPLE_CACHE +#if defined(APPCACHE_USE_SIMPLE_CACHE) +// There is no such upgrade path in this case. +#else TEST(AppCacheDatabaseTest, UpgradeSchema4to5) { // Real file on disk for this test. base::ScopedTempDir temp_dir; @@ -1124,5 +1131,6 @@ TEST(AppCacheDatabaseTest, UpgradeSchema4to5) { EXPECT_FALSE(whitelists[i].is_pattern); } } +#endif // !APPCACHE_USE_SIMPLE_CACHE } // namespace appcache |