Fix some storage unit tests

A few of these tests have some subtle scheduling issues which are
hit when we attempt to turn on more granular Mojo bindings message
dispatch.

This CL adds some synchronization via FlushForTesting calls where
appropriate to avoid such issues.

TBR=sky@chromium.org

Bug: 869553
Change-Id: I8d4d5be6f670db3b3e369f70dfd987dc0b1f1ff2
Reviewed-on: https://chromium-review.googlesource.com/1159591
Commit-Queue: Ken Rockot <rockot@chromium.org>
Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580059}

content/browser/dom_storage/local_storage_context_mojo_unittest.cc

@@ -1081,7 +1081,6 @@ TEST_F(LocalStorageContextMojoTestWithService, RecreateOnCommitFailure) {
     area1->Put(key, value, base::nullopt, "source",
                base::BindLambdaForTesting([&](bool success) {
                  EXPECT_TRUE(success);
-                 put_loop.Quit();
                }));
     put_loop.RunUntilIdle();
     values_written++;
@@ -1093,6 +1092,7 @@ TEST_F(LocalStorageContextMojoTestWithService, RecreateOnCommitFailure) {
   // Make sure all messages to the DB have been processed (Flush above merely
   // schedules a commit, but there is no guarantee about those having been
   // processed yet).
+  mock_leveldb_service.FlushBindingsForTesting();
   if (mock_db)
     mock_db->FlushForTesting();
   // At this point enough commit failures should have happened to cause the

content/browser/dom_storage/session_storage_context_mojo_unittest.cc

@@ -663,7 +663,6 @@ TEST_F(SessionStorageContextMojoTest, RecreateOnCommitFailure) {
     area1->Put(leveldb::StringPieceToUint8Vector("key"), value, base::nullopt,
                "source", base::BindLambdaForTesting([&](bool success) {
                  EXPECT_TRUE(success);
-                 put_loop.Quit();
                }));
     area1.FlushForTesting();
     put_loop.RunUntilIdle();
@@ -674,6 +673,7 @@ TEST_F(SessionStorageContextMojoTest, RecreateOnCommitFailure) {
   // Make sure all messages to the DB have been processed (Flush above merely
   // schedules a commit, but there is no guarantee about those having been
   // processed yet).
+  fake_leveldb_service.FlushBindingsForTesting();
   if (mock_db)
     mock_db->FlushForTesting();
   // At this point enough commit failures should have happened to cause the

content/browser/dom_storage/storage_area_impl_unittest.cc

@@ -278,6 +278,8 @@ class StorageAreaImplTest : public testing::Test,
       area->ScheduleImmediateCommit();
       loop.Run();
     }
+
+    db_.FlushBindingsForTesting();
   }
 
   const std::vector<Observation>& observations() { return observations_; }

content/browser/dom_storage/test/fake_leveldb_service.cc

@@ -79,5 +79,9 @@ void FakeLevelDBService::Bind(
       this, leveldb::mojom::LevelDBServiceRequest(std::move(interface_pipe)));
 }
 
+void FakeLevelDBService::FlushBindingsForTesting() {
+  bindings_.FlushForTesting();
+}
+
 }  // namespace test
 }  // namespace content

content/browser/dom_storage/test/fake_leveldb_service.h

@@ -86,6 +86,8 @@ class FakeLevelDBService : public leveldb::mojom::LevelDBService {
             mojo::ScopedMessagePipeHandle interface_pipe,
             const service_manager::BindSourceInfo& source_info);
 
+  void FlushBindingsForTesting();
+
  private:
   mojo::BindingSet<leveldb::mojom::LevelDBService> bindings_;
 

content/test/fake_leveldb_database.cc

@@ -236,6 +236,10 @@ void FakeLevelDBDatabase::IteratorPrev(const base::UnguessableToken& iterator,
   NOTREACHED();
 }
 
+void FakeLevelDBDatabase::FlushBindingsForTesting() {
+  bindings_.FlushForTesting();
+}
+
 std::vector<std::pair<std::vector<uint8_t>, std::vector<uint8_t>>>
 FakeLevelDBDatabase::CopyPrefixedHelper(
     const std::vector<uint8_t>& source_key_prefix,

content/test/fake_leveldb_database.h

@@ -62,6 +62,8 @@ class FakeLevelDBDatabase : public leveldb::mojom::LevelDBDatabase {
   void IteratorPrev(const base::UnguessableToken& iterator,
                     IteratorPrevCallback callback) override;
 
+  void FlushBindingsForTesting();
+
  private:
   std::vector<std::pair<std::vector<uint8_t>, std::vector<uint8_t>>>
   CopyPrefixedHelper(const std::vector<uint8_t>& source_key_prefix,