[Offline Pages] Converts MarkAttemptCompleted to use TaskQueue

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 <utility>
 
 #include "base/bind.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/offline_pages/background/request_queue_in_memory_store.h"
 #include "components/offline_pages/background/save_page_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace offline_pages {
 
@@ skipping 456 matching lines @@
   ASSERT_TRUE(update_requests_result());
   EXPECT_EQ(1UL, update_requests_result()->item_statuses.size());
   EXPECT_EQ(kRequestId, update_requests_result()->item_statuses.at(0).first);
   EXPECT_EQ(ItemActionStatus::SUCCESS,
             update_requests_result()->item_statuses.at(0).second);
   EXPECT_EQ(1UL, update_requests_result()->updated_items.size());
   EXPECT_EQ(SavePageRequest::RequestState::AVAILABLE,
             update_requests_result()->updated_items.at(0).request_state());
 }
 
 TEST_F(RequestQueueTest, MarkAttemptAbortedRequestNotPresent) {

[Pete Williamson, 2016/10/31 21:38:27]

Does it also make sense to test the "not present" case for mark completed? 
Perhaps there was a race condition, and it got removed before the callback
arrived to cause it to be marked completed?

[dougarnett, 2016/10/31 22:51:18]

That logic resides in a base class now and so this Aborted test
covers testing that base class behavior. Adding comparable Completed
test would not actually add any test coverage. 

   // First add a request.  Retry count will be set to 0.
   base::Time creation_time = base::Time::Now();
   // This request is never put into the queue.
   SavePageRequest request1(kRequestId, kUrl, kClientId, creation_time,
                            kUserRequested);
 
   queue()->MarkAttemptAborted(kRequestId,
                               base::Bind(&RequestQueueTest::UpdateRequestsDone,
                                          base::Unretained(this)));
   PumpLoop();
   ASSERT_EQ(1ul, update_requests_result()->item_statuses.size());
   EXPECT_EQ(kRequestId, update_requests_result()->item_statuses.at(0).first);
   EXPECT_EQ(ItemActionStatus::NOT_FOUND,
             update_requests_result()->item_statuses.at(0).second);
   EXPECT_EQ(0ul, update_requests_result()->updated_items.size());
 }
 
+TEST_F(RequestQueueTest, MarkAttemptCompleted) {
+  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();
+
+  // Start request.
+  queue()->MarkAttemptStarted(kRequestId,
+                              base::Bind(&RequestQueueTest::UpdateRequestsDone,
+                                         base::Unretained(this)));
+  PumpLoop();
+  ClearResults();
+
+  queue()->MarkAttemptCompleted(
+      kRequestId, base::Bind(&RequestQueueTest::UpdateRequestsDone,
+                             base::Unretained(this)));
+  PumpLoop();
+
+  ASSERT_TRUE(update_requests_result());
+  EXPECT_EQ(1UL, update_requests_result()->item_statuses.size());
+  EXPECT_EQ(kRequestId, update_requests_result()->item_statuses.at(0).first);
+  EXPECT_EQ(ItemActionStatus::SUCCESS,
+            update_requests_result()->item_statuses.at(0).second);
+  EXPECT_EQ(1UL, update_requests_result()->updated_items.size());
+  EXPECT_EQ(SavePageRequest::RequestState::AVAILABLE,
+            update_requests_result()->updated_items.at(0).request_state());
+}
+
 }  // namespace offline_pages