[Offline pages] Updating the UpdateCallback in OPMStoreSQL

components/offline_pages/offline_page_metadata_store_impl_unittest.cc

Index: components/offline_pages/offline_page_metadata_store_impl_unittest.cc
diff --git a/components/offline_pages/offline_page_metadata_store_impl_unittest.cc b/components/offline_pages/offline_page_metadata_store_impl_unittest.cc
index 88cd6ffb3dc5eaee4c0426ef7f2c1ce1d703413b..5c87790e6ceb5b593366d86af642e6d580d92a9b 100644
--- a/components/offline_pages/offline_page_metadata_store_impl_unittest.cc
+++ b/components/offline_pages/offline_page_metadata_store_impl_unittest.cc
@@ -26,6 +26,8 @@ namespace offline_pages {
 
 namespace {
 
+using ItemActionStatus = OfflinePageMetadataStore::ItemActionStatus;
+
 #define OFFLINE_PAGES_TABLE_V1 "offlinepages_v1"
 
 const char kTestClientNamespace[] = "CLIENT_NAMESPACE";
@@ -233,8 +235,11 @@ class OfflinePageMetadataStoreTest : public testing::Test {
   void GetOfflinePagesCallback(
       OfflinePageMetadataStore::LoadStatus load_status,
       const std::vector<OfflinePageItem>& offline_pages);
-  void AddCallback(OfflinePageMetadataStore::ItemActionStatus status);
-  void UpdateCallback(CalledCallback called_callback, bool success);
+  void AddCallback(ItemActionStatus status);
+  void UpdateCallback(CalledCallback called_callback,
+                      const std::map<int64_t, ItemActionStatus>& failed_items,
+                      const std::vector<OfflinePageItem>& updated_items);
+  void ResetCallback(bool status);
 
   void ClearResults();
 
@@ -276,8 +281,7 @@ void OfflinePageMetadataStoreTest::GetOfflinePagesCallback(
   offline_pages_.swap(const_cast<std::vector<OfflinePageItem>&>(offline_pages));
 }
 
-void OfflinePageMetadataStoreTest::AddCallback(
-    OfflinePageMetadataStore::ItemActionStatus status) {
+void OfflinePageMetadataStoreTest::AddCallback(ItemActionStatus status) {
   last_called_callback_ = ADD;
   // TODO(fgorski): Add specific add status.
   // last_item_status_ = status;
@@ -287,8 +291,14 @@ void OfflinePageMetadataStoreTest::AddCallback(
 
 void OfflinePageMetadataStoreTest::UpdateCallback(
     CalledCallback called_callback,
-    bool status) {
+    const std::map<int64_t, ItemActionStatus>& failed_items,
+    const std::vector<OfflinePageItem>& updated_items) {
   last_called_callback_ = called_callback;
+  last_status_ = updated_items.size() > 0 ? STATUS_TRUE : STATUS_FALSE;

[Pete Williamson, 2016/09/15 18:05:43]

Should we save more information here?  This doesn't capture if any items failed
the update.  Maybe save a copy of failed_items, so we can see if the size is
non-zero in unit tests.

[fgorski, 2016/09/19 23:24:30]

Done. I actually take the ownership of the result. I am doing basic validation
in tests, but we can extend that further.

+}
+
+void OfflinePageMetadataStoreTest::ResetCallback(bool status) {
+  last_called_callback_ = RESET;
   last_status_ = status ? STATUS_TRUE : STATUS_FALSE;
 }
 
@@ -707,8 +717,8 @@ TEST_F(OfflinePageMetadataStoreTest, ClearAllOfflinePages) {
   EXPECT_EQ(2U, offline_pages_.size());
 
   // Clear all records from the store.
-  store->Reset(base::Bind(&OfflinePageMetadataStoreTest::UpdateCallback,
-                          base::Unretained(this), RESET));
+  store->Reset(base::Bind(&OfflinePageMetadataStoreTest::ResetCallback,
+                          base::Unretained(this)));
   PumpLoop();
   EXPECT_EQ(RESET, last_called_callback_);
   EXPECT_EQ(STATUS_TRUE, last_status_);