[DOMStorage] Don't just flush main loop in tests, but flush all threads.

Flushing just the main thread could cause tasks on the leveldb and/or
file task runners to not be executed when we expected them to. Flushing
those task runners as well should reduce test flakiness.

And re-enable LocalStorageContextMojoTestWithService.InvalidVersionOnDisk
as this seems to fix the flakiness in that test.

Bug: 756550
Change-Id: I7fbdfad9ed5581a0a2dbd030500cc80b9eb2fea1
Reviewed-on: https://chromium-review.googlesource.com/1107117Reviewed-by: Daniel Murphy <dmurph@chromium.org>
Commit-Queue: Daniel Murphy <dmurph@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568635}

content/browser/dom_storage/local_storage_context_mojo_unittest.cc

@@ -766,7 +766,7 @@ class LocalStorageContextMojoTestWithService
     run_loop.Run();
     EXPECT_TRUE(success);
     area.reset();
-    base::RunLoop().RunUntilIdle();
+    RunUntilIdle();
   }
 
   bool DoTestGet(LocalStorageContextMojo* context,
@@ -825,7 +825,7 @@ TEST_F(LocalStorageContextMojoTestWithService, InMemory) {
 
   context->ShutdownAndDelete();
   context = nullptr;
-  base::RunLoop().RunUntilIdle();
+  RunUntilIdle();
 
   // Should not have created any files.
   EXPECT_TRUE(FirstEntryInDir().empty());
@@ -856,7 +856,7 @@ TEST_F(LocalStorageContextMojoTestWithService, InMemoryInvalidPath) {
 
   context->ShutdownAndDelete();
   context = nullptr;
-  base::RunLoop().RunUntilIdle();
+  RunUntilIdle();
 
   // Should not have created any files.
   EXPECT_TRUE(FirstEntryInDir().empty());
@@ -877,7 +877,7 @@ TEST_F(LocalStorageContextMojoTestWithService, OnDisk) {
 
   context->ShutdownAndDelete();
   context = nullptr;
-  base::RunLoop().RunUntilIdle();
+  RunUntilIdle();
 
   // Should have created files.
   EXPECT_EQ(test_path, FirstEntryInDir().BaseName());
@@ -891,13 +891,7 @@ TEST_F(LocalStorageContextMojoTestWithService, OnDisk) {
   context->ShutdownAndDelete();
 }
 
-// Flaky on Android. https://crbug.com/756550
-#if defined(OS_ANDROID)
-#define MAYBE_InvalidVersionOnDisk DISABLED_InvalidVersionOnDisk
-#else
-#define MAYBE_InvalidVersionOnDisk InvalidVersionOnDisk
-#endif
-TEST_F(LocalStorageContextMojoTestWithService, MAYBE_InvalidVersionOnDisk) {
+TEST_F(LocalStorageContextMojoTestWithService, InvalidVersionOnDisk) {
   base::FilePath test_path(FILE_PATH_LITERAL("test_path"));
 
   // Create context and add some data to it.
@@ -914,7 +908,7 @@ TEST_F(LocalStorageContextMojoTestWithService, MAYBE_InvalidVersionOnDisk) {
 
   context->ShutdownAndDelete();
   context = nullptr;
-  base::RunLoop().RunUntilIdle();
+  RunUntilIdle();
 
   {
     // Mess up version number in database.
@@ -939,7 +933,7 @@ TEST_F(LocalStorageContextMojoTestWithService, MAYBE_InvalidVersionOnDisk) {
 
   context->ShutdownAndDelete();
   context = nullptr;
-  base::RunLoop().RunUntilIdle();
+  RunUntilIdle();
 
   // Data should have been preserved now.
   context = new LocalStorageContextMojo(base::ThreadTaskRunnerHandle::Get(),
@@ -967,9 +961,7 @@ TEST_F(LocalStorageContextMojoTestWithService, CorruptionOnDisk) {
 
   context->ShutdownAndDelete();
   context = nullptr;
-  base::RunLoop().RunUntilIdle();
-  // Also flush Task Scheduler tasks to make sure the leveldb is fully closed.
-  content::RunAllTasksUntilIdle();
+  RunUntilIdle();
 
   // Delete manifest files to mess up opening DB.
   base::FilePath db_path =
@@ -992,7 +984,7 @@ TEST_F(LocalStorageContextMojoTestWithService, CorruptionOnDisk) {
 
   context->ShutdownAndDelete();
   context = nullptr;
-  base::RunLoop().RunUntilIdle();
+  RunUntilIdle();
 
   // Data should have been preserved now.
   context = new LocalStorageContextMojo(base::ThreadTaskRunnerHandle::Get(),

content/browser/dom_storage/test/mojo_test_with_file_service.h

@@ -34,6 +34,8 @@ class MojoTestWithFileService : public testing::Test {
 
   service_manager::Connector* connector() const { return connector_.get(); }
 
+  void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+
  private:
   base::test::ScopedTaskEnvironment scoped_task_environment_;
   std::unique_ptr<service_manager::TestConnectorFactory> test_connector_;