Merge 21550 - Disk cache: Avoid restarting the cache while it may be in use....

net/disk_cache/backend_unittest.cc

Index: net/disk_cache/backend_unittest.cc
===================================================================
--- net/disk_cache/backend_unittest.cc	(revision 22787)
+++ net/disk_cache/backend_unittest.cc	(working copy)
@@ -1099,6 +1099,7 @@
   EXPECT_EQ(2, cache_->GetEntryCount());
 
   EXPECT_FALSE(cache_->OpenNextEntry(&iter, &entry));
+  MessageLoop::current()->RunAllPending();
   EXPECT_EQ(0, cache_->GetEntryCount());
 }
 
@@ -1149,6 +1150,7 @@
   EXPECT_FALSE(cache_->CreateEntry("Something new", &entry2));
 
   entry1->Close();
+  MessageLoop::current()->RunAllPending();
 
   EXPECT_EQ(0, cache_->GetEntryCount());
 }
@@ -1203,6 +1205,7 @@
     ASSERT_LT(count, 9);
   };
 
+  MessageLoop::current()->RunAllPending();
   EXPECT_EQ(0, cache_->GetEntryCount());
 }
 
@@ -1251,6 +1254,8 @@
   entry1->Close();
 
   EXPECT_FALSE(cache_->OpenNextEntry(&iter, &entry2));
+  MessageLoop::current()->RunAllPending();
+
   ASSERT_TRUE(cache_->CreateEntry("Something new", &entry2));
   entry2->Close();
 
Property changes on: net\disk_cache\backend_unittest.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/net/disk_cache/backend_unittest.cc:r21550