Adds request queue removal capability to OfflinePageBridge.

components/offline_pages/background/request_coordinator_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_coordinator.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 196 matching lines @@
   }
 
   // Callback for Add requests.
   void AddRequestDone(RequestQueue::AddRequestResult result,
                       const SavePageRequest& request);
 
   // Callback for getting requests.
   void GetRequestsDone(RequestQueue::GetRequestsResult result,
                        const std::vector<SavePageRequest>& requests);
 
+  // Callback for removing requests.
+  void RemoveRequestsDone(
+      const RequestQueue::UpdateMultipleRequestResults& results);
+
   // Callback for getting request statuses.
   void GetQueuedRequestsDone(const std::vector<SavePageRequest>& requests);
 
   void SendOfflinerDoneCallback(const SavePageRequest& request,
                                 Offliner::RequestStatus status);
 
   RequestQueue::GetRequestsResult last_get_requests_result() const {
     return last_get_requests_result_;
   }
 
   const std::vector<SavePageRequest>& last_requests() const {
     return last_requests_;
   }
 
+  const RequestQueue::UpdateMultipleRequestResults& last_remove_results()
+      const {
+    return last_remove_results_;
+  }
+
   void EnableOfflinerCallback(bool enable) {
     offliner_->enable_callback(enable);
   }
 
   void SetOfflinerTimeoutForTest(const base::TimeDelta& timeout) {
     coordinator_->SetOfflinerTimeoutForTest(timeout);
   }
 
   void SetDeviceConditionsForTest(DeviceConditions device_conditions) {
     coordinator_->SetDeviceConditionsForTest(device_conditions);
@@ skipping 11 matching lines @@
     return coordinator_->last_offlining_status_;
   }
 
   bool OfflinerWasCanceled() const { return offliner_->cancel_called(); }
 
   ObserverStub observer() { return observer_; }
 
  private:
   RequestQueue::GetRequestsResult last_get_requests_result_;
   std::vector<SavePageRequest> last_requests_;
+  RequestQueue::UpdateMultipleRequestResults last_remove_results_;
   scoped_refptr<base::TestMockTimeTaskRunner> task_runner_;
   base::ThreadTaskRunnerHandle task_runner_handle_;
   std::unique_ptr<RequestCoordinator> coordinator_;
   OfflinerStub* offliner_;
   base::WaitableEvent waiter_;
   ObserverStub observer_;
 };
 
 RequestCoordinatorTest::RequestCoordinatorTest()
     : last_get_requests_result_(RequestQueue::GetRequestsResult::STORE_FAILURE),
@@ skipping 25 matching lines @@
   task_runner_->RunUntilIdle();
 }
 
 void RequestCoordinatorTest::GetRequestsDone(
     RequestQueue::GetRequestsResult result,
     const std::vector<SavePageRequest>& requests) {
   last_get_requests_result_ = result;
   last_requests_ = requests;
 }
 
+void RequestCoordinatorTest::RemoveRequestsDone(
+    const RequestQueue::UpdateMultipleRequestResults& results) {
+  last_remove_results_ = results;
+  waiter_.Signal();
+}
+
 void RequestCoordinatorTest::GetQueuedRequestsDone(
     const std::vector<SavePageRequest>& requests) {
   last_requests_ = requests;
   waiter_.Signal();
 }
 
 void RequestCoordinatorTest::AddRequestDone(
     RequestQueue::AddRequestResult result,
     const SavePageRequest& request) {}
 
@@ skipping 307 matching lines @@
                                      net::NetworkChangeNotifier::CONNECTION_3G);
   base::Callback<void(bool)> callback = base::Bind(
       &RequestCoordinatorTest::EmptyCallbackFunction, base::Unretained(this));
   EXPECT_TRUE(coordinator()->StartProcessing(device_conditions, callback));
 
   // Let all the async parts of the start processing pipeline run to completion.
   PumpLoop();
 
   // Remove the request while it is processing.
   std::vector<int64_t> request_ids{kRequestId1};
-  coordinator()->RemoveRequests(request_ids);
+  coordinator()->RemoveRequests(
+      request_ids, base::Bind(&RequestCoordinatorTest::RemoveRequestsDone,
+                              base::Unretained(this)));
 
   // Let the async callbacks in the cancel run.
   PumpLoop();
 
   // Since offliner was started, it will have seen cancel call.
   EXPECT_TRUE(OfflinerWasCanceled());
 }
 
 TEST_F(RequestCoordinatorTest, WatchdogTimeout) {
   // Build a request to use with the pre-renderer, and put it on the queue.
@@ skipping 137 matching lines @@
   observer().Clear();
 
   // Resume the request.
   coordinator()->ResumeRequests(request_ids);
   PumpLoop();
 
   EXPECT_TRUE(observer().changed_called());
   EXPECT_EQ(SavePageRequest::RequestState::AVAILABLE, observer().state());
 }
 
-TEST_F(RequestCoordinatorTest, ObserverdRemoveRequest) {
+TEST_F(RequestCoordinatorTest, RemoveRequest) {
   // Add a request to the queue.
   offline_pages::SavePageRequest request1(kRequestId1, kUrl1, kClientId1,
                                           base::Time::Now(), kUserRequested);
   coordinator()->queue()->AddRequest(
       request1, base::Bind(&RequestCoordinatorTest::AddRequestDone,
                            base::Unretained(this)));
   PumpLoop();
 
   // Remove the request.
   std::vector<int64_t> request_ids;
   request_ids.push_back(kRequestId1);
-  coordinator()->RemoveRequests(request_ids);
+  coordinator()->RemoveRequests(
+      request_ids, base::Bind(&RequestCoordinatorTest::RemoveRequestsDone,
+                              base::Unretained(this)));
+
+  PumpLoop();
+  WaitForCallback();
   PumpLoop();
 
   EXPECT_TRUE(observer().completed_called());
   EXPECT_EQ(RequestCoordinator::SavePageStatus::REMOVED,
             observer().last_status());
+  EXPECT_EQ(1UL, last_remove_results().size());
+  EXPECT_EQ(kRequestId1, std::get<0>(last_remove_results().at(0)));
 }
 
 }  // namespace offline_pages