[IndexedDB] Fixed flaky "While" tests in dispatcher host

The connection is force closed when a transaction is aborted
mid-execution. The "While" tests failed to catch this, so
added another EXPECT_CALL for ForcedClose().

Bug: 742503
Change-Id: Id56a5cced876bc8a4d02c60a29e20471085a29ac
Reviewed-on: https://chromium-review.googlesource.com/571197
Commit-Queue: Kristi Park <kristipark@chromium.org>
Reviewed-by: Daniel Murphy <dmurph@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486925}

content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc

@@ -483,9 +483,7 @@ TEST_F(IndexedDBDispatcherHostTest, CompactDatabaseWithConnection) {
   EXPECT_EQ(::indexed_db::mojom::Status::OK, callback_result);
 }
 
-// Flaky: crbug.com/742503
-TEST_F(IndexedDBDispatcherHostTest,
-       DISABLED_CompactDatabaseWhileDoingTransaction) {
+TEST_F(IndexedDBDispatcherHostTest, CompactDatabaseWhileDoingTransaction) {
   const int64_t kDBVersion = 1;
   const int64_t kTransactionId = 1;
   const int64_t kObjectStoreId = 10;
@@ -524,7 +522,7 @@ TEST_F(IndexedDBDispatcherHostTest,
   {
     ::testing::InSequence dummy;
     base::RunLoop loop;
-    base::Closure quit_closure = base::BarrierClosure(3, loop.QuitClosure());
+    base::Closure quit_closure = base::BarrierClosure(4, loop.QuitClosure());
     const url::Origin origin = url::Origin(GURL(kOrigin));
 
     EXPECT_CALL(
@@ -536,6 +534,9 @@ TEST_F(IndexedDBDispatcherHostTest,
                 Error(blink::kWebIDBDatabaseExceptionAbortError, _))
         .Times(1)
         .WillOnce(RunClosure(quit_closure));
+    EXPECT_CALL(*connection.connection_callbacks, ForcedClose())
+        .Times(1)
+        .WillOnce(RunClosure(quit_closure));
 
     ASSERT_TRUE(connection.database.is_bound());
     connection.database->CreateObjectStore(kTransactionId, kObjectStoreId,
@@ -550,8 +551,7 @@ TEST_F(IndexedDBDispatcherHostTest,
   EXPECT_EQ(::indexed_db::mojom::Status::OK, callback_result);
 }
 
-// Flaky: crbug.com/742503
-TEST_F(IndexedDBDispatcherHostTest, DISABLED_CompactDatabaseWhileUpgrading) {
+TEST_F(IndexedDBDispatcherHostTest, CompactDatabaseWhileUpgrading) {
   const int64_t kDBVersion = 1;
   const int64_t kTransactionId = 1;
 
@@ -588,7 +588,7 @@ TEST_F(IndexedDBDispatcherHostTest, DISABLED_CompactDatabaseWhileUpgrading) {
   {
     ::testing::InSequence dummy;
     base::RunLoop loop;
-    base::Closure quit_closure = base::BarrierClosure(3, loop.QuitClosure());
+    base::Closure quit_closure = base::BarrierClosure(4, loop.QuitClosure());
     const url::Origin origin = url::Origin(GURL(kOrigin));
 
     EXPECT_CALL(
@@ -600,6 +600,9 @@ TEST_F(IndexedDBDispatcherHostTest, DISABLED_CompactDatabaseWhileUpgrading) {
                 Error(blink::kWebIDBDatabaseExceptionAbortError, _))
         .Times(1)
         .WillOnce(RunClosure(quit_closure));
+    EXPECT_CALL(*connection.connection_callbacks, ForcedClose())
+        .Times(1)
+        .WillOnce(RunClosure(quit_closure));
 
     ASSERT_TRUE(connection.database.is_bound());
     idb_mojo_factory_->AbortTransactionsAndCompactDatabase(
@@ -649,7 +652,7 @@ TEST_F(IndexedDBDispatcherHostTest,
   {
     ::testing::InSequence dummy;
     base::RunLoop loop;
-    base::Closure quit_closure = base::BarrierClosure(3, loop.QuitClosure());
+    base::Closure quit_closure = base::BarrierClosure(4, loop.QuitClosure());
     const url::Origin origin = url::Origin(GURL(kOrigin));
 
     EXPECT_CALL(*connection.connection_callbacks, Complete(kTransactionId))
@@ -660,6 +663,9 @@ TEST_F(IndexedDBDispatcherHostTest,
         MockedSuccessDatabase(IsAssociatedInterfacePtrInfoValid(false), _))
         .Times(1)
         .WillOnce(RunClosure(quit_closure));
+    EXPECT_CALL(*connection.connection_callbacks, ForcedClose())
+        .Times(1)
+        .WillOnce(RunClosure(quit_closure));
 
     connection.database->Commit(kTransactionId);
     idb_mojo_factory_->AbortTransactionsForDatabase(
@@ -671,9 +677,7 @@ TEST_F(IndexedDBDispatcherHostTest,
   EXPECT_EQ(::indexed_db::mojom::Status::OK, callback_result);
 }
 
-// Flaky: crbug.com/742503
-TEST_F(IndexedDBDispatcherHostTest,
-       DISABLED_AbortTransactionsWhileDoingTransaction) {
+TEST_F(IndexedDBDispatcherHostTest, AbortTransactionsWhileDoingTransaction) {
   const int64_t kDBVersion = 1;
   const int64_t kTransactionId = 1;
   const int64_t kObjectStoreId = 10;
@@ -712,7 +716,7 @@ TEST_F(IndexedDBDispatcherHostTest,
   {
     ::testing::InSequence dummy;
     base::RunLoop loop;
-    base::Closure quit_closure = base::BarrierClosure(3, loop.QuitClosure());
+    base::Closure quit_closure = base::BarrierClosure(4, loop.QuitClosure());
     const url::Origin origin = url::Origin(GURL(kOrigin));
 
     EXPECT_CALL(
@@ -724,6 +728,9 @@ TEST_F(IndexedDBDispatcherHostTest,
                 Error(blink::kWebIDBDatabaseExceptionAbortError, _))
         .Times(1)
         .WillOnce(RunClosure(quit_closure));
+    EXPECT_CALL(*connection.connection_callbacks, ForcedClose())
+        .Times(1)
+        .WillOnce(RunClosure(quit_closure));
 
     ASSERT_TRUE(connection.database.is_bound());
     connection.database->CreateObjectStore(kTransactionId, kObjectStoreId,
@@ -738,8 +745,7 @@ TEST_F(IndexedDBDispatcherHostTest,
   EXPECT_EQ(::indexed_db::mojom::Status::OK, callback_result);
 }
 
-// Flaky: crbug.com/742503
-TEST_F(IndexedDBDispatcherHostTest, DISABLED_AbortTransactionsWhileUpgrading) {
+TEST_F(IndexedDBDispatcherHostTest, AbortTransactionsWhileUpgrading) {
   const int64_t kDBVersion = 1;
   const int64_t kTransactionId = 1;
 
@@ -776,7 +782,7 @@ TEST_F(IndexedDBDispatcherHostTest, DISABLED_AbortTransactionsWhileUpgrading) {
   {
     ::testing::InSequence dummy;
     base::RunLoop loop;
-    base::Closure quit_closure = base::BarrierClosure(3, loop.QuitClosure());
+    base::Closure quit_closure = base::BarrierClosure(4, loop.QuitClosure());
     const url::Origin origin = url::Origin(GURL(kOrigin));
 
     EXPECT_CALL(
@@ -788,6 +794,9 @@ TEST_F(IndexedDBDispatcherHostTest, DISABLED_AbortTransactionsWhileUpgrading) {
                 Error(blink::kWebIDBDatabaseExceptionAbortError, _))
         .Times(1)
         .WillOnce(RunClosure(quit_closure));
+    EXPECT_CALL(*connection.connection_callbacks, ForcedClose())
+        .Times(1)
+        .WillOnce(RunClosure(quit_closure));
 
     ASSERT_TRUE(connection.database.is_bound());
     idb_mojo_factory_->AbortTransactionsForDatabase(