Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Unified Diff: net/disk_cache/backend_unittest.cc

Issue 103533012: Disk Cache: Use the old WorkerPool for Async IO on iOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nits Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/disk_cache/backend_unittest.cc
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc
index 156f20632604e6e98072ad5dce7d2f62c71a9b76..02d3b681dc6694dd627bd2ab56b1c8e368c9bbdd 100644
--- a/net/disk_cache/backend_unittest.cc
+++ b/net/disk_cache/backend_unittest.cc
@@ -518,9 +518,13 @@ void DiskCacheBackendTest::BackendShutdownWithPendingFileIO(bool fast) {
base::MessageLoop::current()->RunUntilIdle();
+#if !defined(OS_IOS)
// Wait for the actual operation to complete, or we'll keep a file handle that
- // may cause issues later.
+ // may cause issues later. Note that on iOS systems even though this test
+ // uses a single thread, the actual IO is posted to a worker thread and the
+ // cache destructor breaks the link to reach cb when the operation completes.
rv = cb.GetResult(rv);
+#endif
}
TEST_F(DiskCacheBackendTest, ShutdownWithPendingFileIO) {
@@ -543,6 +547,8 @@ TEST_F(DiskCacheBackendTest, ShutdownWithPendingFileIO_Fast) {
}
#endif
+// See crbug.com/330074
+#if !defined(OS_IOS)
// Tests that one cache instance is not affected by another one going away.
TEST_F(DiskCacheBackendTest, MultipleInstancesWithPendingFileIO) {
base::ScopedTempDir store;
@@ -576,6 +582,7 @@ TEST_F(DiskCacheBackendTest, MultipleInstancesWithPendingFileIO) {
// may cause issues later.
rv = cb.GetResult(rv);
}
+#endif
// Tests that we deal with background-thread pending operations.
void DiskCacheBackendTest::BackendShutdownWithPendingIO(bool fast) {
« no previous file with comments | « net/disk_cache/backend_impl.cc ('k') | net/disk_cache/file.h » ('j') | net/net.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698