[Offline pages] Eliminating duplicate notifications, by fixing request queue store

components/offline_pages/background/request_queue_store_unittest.cc

 // Copyright 2016 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 "components/offline_pages/background/request_queue_store.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 287 matching lines @@
   store->RemoveRequests(request_ids,
                         base::Bind(&RequestQueueStoreTestBase::RemoveDone,
                                    base::Unretained(this)));
   ASSERT_EQ(0ul, this->last_remove_results().size());
   this->PumpLoop();
   ASSERT_EQ(2ul, this->last_remove_results().size());
   ASSERT_EQ(RequestQueue::UpdateRequestResult::SUCCESS,
             this->last_remove_results().at(0).second);
   ASSERT_EQ(RequestQueue::UpdateRequestResult::SUCCESS,
             this->last_remove_results().at(1).second);
+  ASSERT_EQ(2UL, this->last_requests().size());
   ASSERT_EQ(kRequestId, this->last_requests().at(0).request_id());
   this->ClearResults();
 
   store->GetRequests(base::Bind(&RequestQueueStoreTestBase::GetRequestsDone,
                                 base::Unretained(this)));
   this->PumpLoop();
   ASSERT_EQ(LastResult::kTrue, this->last_result());
   ASSERT_TRUE(this->last_requests().empty());
   this->ClearResults();
 
   // Try to remove a request that is not in the queue.
   store->RemoveRequests(request_ids,
                         base::Bind(&RequestQueueStoreTestBase::RemoveDone,
                                    base::Unretained(this)));
   ASSERT_EQ(LastResult::kNone, this->last_result());
   this->PumpLoop();
   ASSERT_EQ(2ul, this->last_remove_results().size());
-  // Since the SQL statement returns true on a delete of an item that isn't
-  // present, SQL is returning SUCCESS, but the memory is returning
-  // REQUEST_DOES_NOT_EXIST, so we just check that the result is not failure.
-  ASSERT_NE(RequestQueue::UpdateRequestResult::STORE_FAILURE,
+  // When requests are missing, we expect the results to say so, but since they
+  // are missing, no requests should have been returned.
+  ASSERT_EQ(RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST,
             this->last_remove_results().at(0).second);
-  ASSERT_NE(RequestQueue::UpdateRequestResult::STORE_FAILURE,
+  ASSERT_EQ(RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST,
             this->last_remove_results().at(1).second);
+  ASSERT_EQ(0UL, this->last_requests().size());
 }
 
 TYPED_TEST(RequestQueueStoreTest, PauseAndResumeRequest) {
   std::unique_ptr<RequestQueueStore> store(this->BuildStore());
   base::Time creation_time = base::Time::Now();
 
   // Create request and add it to the queue.
   SavePageRequest request1(kRequestId, kUrl, kClientId, creation_time,
                            kUserRequested);
   store->AddOrUpdateRequest(
@@ skipping 106 matching lines @@
   store->GetRequests(base::Bind(&RequestQueueStoreTestBase::GetRequestsDone,
                                 base::Unretained(this)));
   ASSERT_EQ(LastResult::kNone, this->last_result());
   this->PumpLoop();
   ASSERT_EQ(LastResult::kTrue, this->last_result());
   ASSERT_EQ(1ul, this->last_requests().size());
   ASSERT_TRUE(original_request == this->last_requests()[0]);
 }
 
 }  // offline_pages