Return number of values deleted by IDBObjectStore.delete(range)

content/browser/indexed_db/indexed_db_backing_store_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
@@ skipping 441 matching lines @@
     EXPECT_TRUE(transaction2.CommitPhaseTwo().ok());
     EXPECT_EQ(m_value3.bits, result_value.bits);
     EXPECT_TRUE(CheckBlobInfoMatches(result_value.blob_info));
     EXPECT_TRUE(CheckBlobReadsMatchWrites(result_value.blob_info));
   }
 
   {
     IndexedDBBackingStore::Transaction transaction3(backing_store_.get());
     transaction3.Begin();
     IndexedDBValue result_value;
-    EXPECT_TRUE(backing_store_->DeleteRange(&transaction3,
-                                            1,
-                                            1,
-                                            IndexedDBKeyRange(m_key3)).ok());
+    EXPECT_TRUE(

[dmurph, 2016/05/19 01:01:38]

Do you want to put a check in here somewhere that our deleted count is correct?

[cmumford, 2016/05/19 17:07:15]

+1 dmurph's suggestion - also for the other calls in this file. It's "low
hanging test fruit"

[palakj1, 2016/05/19 23:47:52]

Added.

+        backing_store_
+            ->DeleteRange(&transaction3, 1, 1, IndexedDBKeyRange(m_key3), NULL)
+            .ok());
     scoped_refptr<TestCallback> callback(new TestCallback());
     EXPECT_TRUE(transaction3.CommitPhaseOne(callback).ok());
     task_runner_->RunUntilIdle();
     EXPECT_TRUE(callback->called);
     EXPECT_TRUE(callback->succeeded);
     EXPECT_TRUE(transaction3.CommitPhaseTwo().ok());
     EXPECT_TRUE(CheckBlobRemovals());
   }
 }
 
@@ skipping 65 matching lines @@
       EXPECT_TRUE(callback->called);
       EXPECT_TRUE(callback->succeeded);
       EXPECT_TRUE(transaction1.CommitPhaseTwo().ok());
     }
 
     {
       IndexedDBBackingStore::Transaction transaction2(backing_store_.get());
       transaction2.Begin();
       IndexedDBValue result_value;
       EXPECT_TRUE(
-          backing_store_->DeleteRange(&transaction2, 1, i + 1, ranges[i]).ok());
+          backing_store_->DeleteRange(&transaction2, 1, i + 1, ranges[i], NULL)
+              .ok());
       scoped_refptr<TestCallback> callback(new TestCallback());
       EXPECT_TRUE(transaction2.CommitPhaseOne(callback).ok());
       task_runner_->RunUntilIdle();
       EXPECT_TRUE(callback->called);
       EXPECT_TRUE(callback->succeeded);
       EXPECT_TRUE(transaction2.CommitPhaseTwo().ok());
       EXPECT_EQ(2UL, backing_store_->removals().size());
       EXPECT_EQ(backing_store_->writes()[1].key(),
                 backing_store_->removals()[0]);
       EXPECT_EQ(backing_store_->writes()[2].key(),
@@ skipping 69 matching lines @@
       EXPECT_TRUE(callback->called);
       EXPECT_TRUE(callback->succeeded);
       EXPECT_TRUE(transaction1.CommitPhaseTwo().ok());
     }
 
     {
       IndexedDBBackingStore::Transaction transaction2(backing_store_.get());
       transaction2.Begin();
       IndexedDBValue result_value;
       EXPECT_TRUE(
-          backing_store_->DeleteRange(&transaction2, 1, i + 1, ranges[i]).ok());
+          backing_store_->DeleteRange(&transaction2, 1, i + 1, ranges[i], NULL)
+              .ok());
       scoped_refptr<TestCallback> callback(new TestCallback());
       EXPECT_TRUE(transaction2.CommitPhaseOne(callback).ok());
       task_runner_->RunUntilIdle();
       EXPECT_TRUE(callback->called);
       EXPECT_TRUE(callback->succeeded);
       EXPECT_TRUE(transaction2.CommitPhaseTwo().ok());
       EXPECT_EQ(0UL, backing_store_->removals().size());
     }
   }
 }
@@ skipping 73 matching lines @@
     EXPECT_TRUE(CheckBlobInfoMatches(read_result_value.blob_info));
     EXPECT_TRUE(CheckBlobReadsMatchWrites(read_result_value.blob_info));
     for (size_t i = 0; i < read_result_value.blob_info.size(); ++i) {
       read_result_value.blob_info[i].mark_used_callback().Run();
     }
   }
 
   {
     IndexedDBBackingStore::Transaction transaction3(backing_store_.get());
     transaction3.Begin();
-    EXPECT_TRUE(backing_store_->DeleteRange(&transaction3,
-                                            1,
-                                            1,
-                                            IndexedDBKeyRange(m_key3)).ok());
+    EXPECT_TRUE(
+        backing_store_
+            ->DeleteRange(&transaction3, 1, 1, IndexedDBKeyRange(m_key3), NULL)
+            .ok());
     scoped_refptr<TestCallback> callback(new TestCallback());
     EXPECT_TRUE(transaction3.CommitPhaseOne(callback).ok());
     task_runner_->RunUntilIdle();
     EXPECT_TRUE(callback->called);
     EXPECT_TRUE(callback->succeeded);
     EXPECT_TRUE(transaction3.CommitPhaseTwo().ok());
     EXPECT_EQ(0U, backing_store_->removals().size());
     for (size_t i = 0; i < read_result_value.blob_info.size(); ++i) {
       read_result_value.blob_info[i].release_callback().Run(
           read_result_value.blob_info[i].file_path());
@@ skipping 292 matching lines @@
 
   std::vector<base::string16> names = backing_store_->GetDatabaseNames(&s);
   EXPECT_TRUE(s.ok());
   EXPECT_EQ(names.size(), 1ULL);
   EXPECT_EQ(names[0], db1_name);
 }
 
 }  // namespace
 
 }  // namespace content