Adds an observer for the request coordinator.

components/offline_pages/background/request_queue_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.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/test/test_simple_task_runner.h"
@@ skipping 31 matching lines @@
   void SetUp() override;
 
   void PumpLoop();
 
   // Callback for adding requests.
   void AddRequestDone(AddRequestResult result, const SavePageRequest& request);
   // Callback for getting requests.
   void GetRequestsDone(GetRequestsResult result,
                        const std::vector<SavePageRequest>& requests);
   // Callback for removing request.
-  void RemoveRequestDone(
-      const RequestQueue::UpdateMultipleRequestResults& results);
+  void RemoveRequestsDone(
+      const RequestQueue::UpdateMultipleRequestResults& results,
+      const std::vector<SavePageRequest>& requests);
+
+  void UpdateMultipleRequestsDone(
+      const RequestQueue::UpdateMultipleRequestResults& results,
+      const std::vector<SavePageRequest>& requests);
 
   void UpdateRequestDone(UpdateRequestResult result);
 
   RequestQueue* queue() { return queue_.get(); }
 
   AddRequestResult last_add_result() const { return last_add_result_; }
   SavePageRequest* last_added_request() {
     return last_added_request_.get();
   }
 
   const RequestQueue::UpdateMultipleRequestResults& last_remove_results()
       const {
     return last_remove_results_;
   }
 
+  const RequestQueue::UpdateMultipleRequestResults&
+  last_multiple_update_results() const {
+    return last_multiple_update_results_;
+  }
+
   UpdateRequestResult last_update_result() const { return last_update_result_; }
 
   GetRequestsResult last_get_requests_result() const {
     return last_get_requests_result_;
   }
   const std::vector<SavePageRequest>& last_requests() const {
     return last_requests_;
   }
 
  private:
   AddRequestResult last_add_result_;
   std::unique_ptr<SavePageRequest> last_added_request_;
   RequestQueue::UpdateMultipleRequestResults last_remove_results_;
+  RequestQueue::UpdateMultipleRequestResults last_multiple_update_results_;
   UpdateRequestResult last_update_result_;
 
   GetRequestsResult last_get_requests_result_;
   std::vector<SavePageRequest> last_requests_;
 
   std::unique_ptr<RequestQueue> queue_;
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   base::ThreadTaskRunnerHandle task_runner_handle_;
 };
 
@@ skipping 22 matching lines @@
   last_added_request_.reset(new SavePageRequest(request));
 }
 
 void RequestQueueTest::GetRequestsDone(
     GetRequestsResult result,
     const std::vector<SavePageRequest>& requests) {
   last_get_requests_result_ = result;
   last_requests_ = requests;
 }
 
-void RequestQueueTest::RemoveRequestDone(
-    const RequestQueue::UpdateMultipleRequestResults& results) {
+void RequestQueueTest::RemoveRequestsDone(
+    const RequestQueue::UpdateMultipleRequestResults& results,
+    const std::vector<SavePageRequest>& requests) {
   last_remove_results_ = results;
+  last_requests_ = requests;
+}
+
+void RequestQueueTest::UpdateMultipleRequestsDone(
+    const RequestQueue::UpdateMultipleRequestResults& results,
+    const std::vector<SavePageRequest>& requests) {
+  last_multiple_update_results_ = results;
+  last_requests_ = requests;
 }
 
 void RequestQueueTest::UpdateRequestDone(UpdateRequestResult result) {
   last_update_result_ = result;
 }
 
 TEST_F(RequestQueueTest, GetRequestsEmpty) {
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
@@ skipping 23 matching lines @@
   base::Time creation_time = base::Time::Now();
   SavePageRequest request(
       kRequestId, kUrl, kClientId, creation_time, kUserRequested);
   queue()->AddRequest(request, base::Bind(&RequestQueueTest::AddRequestDone,
                                           base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(kRequestId, last_added_request()->request_id());
 
   std::vector<int64_t> remove_requests;
   remove_requests.push_back(kRequestId);
-  queue()->RemoveRequests(
-      remove_requests,
-      base::Bind(&RequestQueueTest::RemoveRequestDone, base::Unretained(this)));
+  queue()->RemoveRequests(remove_requests,
+                          base::Bind(&RequestQueueTest::RemoveRequestsDone,
+                                     base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(1ul, last_remove_results().size());
   ASSERT_EQ(UpdateRequestResult::SUCCESS, last_remove_results().at(0).second);
 
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(GetRequestsResult::SUCCESS, last_get_requests_result());
   ASSERT_EQ(0ul, last_requests().size());
 }
@@ skipping 10 matching lines @@
   SavePageRequest request2(kRequestId2, kUrl2, kClientId2, creation_time,
                            kUserRequested);
   queue()->AddRequest(request2, base::Bind(&RequestQueueTest::AddRequestDone,
                                            base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(kRequestId2, last_added_request()->request_id());
 
   std::vector<int64_t> remove_requests;
   remove_requests.push_back(kRequestId);
   remove_requests.push_back(kRequestId2);
-  queue()->RemoveRequests(
-      remove_requests,
-      base::Bind(&RequestQueueTest::RemoveRequestDone, base::Unretained(this)));
+  queue()->RemoveRequests(remove_requests,
+                          base::Bind(&RequestQueueTest::RemoveRequestsDone,
+                                     base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(2ul, last_remove_results().size());
   ASSERT_EQ(UpdateRequestResult::SUCCESS, last_remove_results().at(0).second);
   ASSERT_EQ(UpdateRequestResult::SUCCESS, last_remove_results().at(1).second);
   ASSERT_EQ(kRequestId, last_remove_results().at(0).first);
   ASSERT_EQ(kRequestId2, last_remove_results().at(1).first);
 
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
@@ skipping 17 matching lines @@
   PumpLoop();
   ASSERT_EQ(GetRequestsResult::SUCCESS, last_get_requests_result());
   ASSERT_EQ(1ul, last_requests().size());
 
   std::vector<int64_t> request_ids;
   request_ids.push_back(kRequestId);
 
   // Pause the request.
   queue()->ChangeRequestsState(
       request_ids, SavePageRequest::RequestState::PAUSED,
-      base::Bind(&RequestQueueTest::UpdateRequestDone, base::Unretained(this)));
+      base::Bind(&RequestQueueTest::UpdateMultipleRequestsDone,
+                 base::Unretained(this)));
   PumpLoop();
-  ASSERT_EQ(UpdateRequestResult::SUCCESS, last_update_result());
+  ASSERT_EQ(1ul, last_multiple_update_results().size());
+  ASSERT_EQ(UpdateRequestResult::SUCCESS,
+            last_multiple_update_results().at(0).second);
 
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
 
   // Verify the request is paused.
   ASSERT_EQ(GetRequestsResult::SUCCESS, last_get_requests_result());
   ASSERT_EQ(1ul, last_requests().size());
   ASSERT_EQ(SavePageRequest::RequestState::PAUSED,
             last_requests().front().request_state());
 
   // Resume the request.
   queue()->ChangeRequestsState(
       request_ids, SavePageRequest::RequestState::AVAILABLE,
-      base::Bind(&RequestQueueTest::UpdateRequestDone, base::Unretained(this)));
+      base::Bind(&RequestQueueTest::UpdateMultipleRequestsDone,
+                 base::Unretained(this)));
   PumpLoop();
-  ASSERT_EQ(UpdateRequestResult::SUCCESS, last_update_result());
+  ASSERT_EQ(1ul, last_multiple_update_results().size());
+  ASSERT_EQ(UpdateRequestResult::SUCCESS,
+            last_multiple_update_results().at(0).second);
 
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
 
   // Verify the request is no longer paused.
   ASSERT_EQ(GetRequestsResult::SUCCESS, last_get_requests_result());
   ASSERT_EQ(1ul, last_requests().size());
   ASSERT_EQ(SavePageRequest::RequestState::AVAILABLE,
             last_requests().front().request_state());
@@ skipping 17 matching lines @@
   ASSERT_EQ(request2.request_id(), last_added_request()->request_id());
 
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(GetRequestsResult::SUCCESS, last_get_requests_result());
   ASSERT_EQ(2ul, last_requests().size());
 
   std::vector<int64_t> remove_requests;
   remove_requests.push_back(request1.request_id());
-  queue()->RemoveRequests(
-      remove_requests,
-      base::Bind(&RequestQueueTest::RemoveRequestDone, base::Unretained(this)));
+  queue()->RemoveRequests(remove_requests,
+                          base::Bind(&RequestQueueTest::RemoveRequestsDone,
+                                     base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(1ul, last_remove_results().size());
   ASSERT_EQ(kRequestId, last_remove_results().at(0).first);
   ASSERT_EQ(UpdateRequestResult::SUCCESS, last_remove_results().at(0).second);
 
   queue()->GetRequests(
       base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(GetRequestsResult::SUCCESS, last_get_requests_result());
   ASSERT_EQ(1ul, last_requests().size());
@@ skipping 39 matching lines @@
 
   // Try to update request1 when only request2 is in the queue.
   queue()->UpdateRequest(
       request1,
       base::Bind(&RequestQueueTest::UpdateRequestDone, base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(UpdateRequestResult::REQUEST_DOES_NOT_EXIST, last_update_result());
 }
 
 }  // namespace offline_pages