[Offline Pages] Converts MarkAttemptCompleted to use TaskQueue

components/offline_pages/background/mark_attempt_completed_task_unittest.cc

Index: components/offline_pages/background/mark_attempt_completed_task_unittest.cc
diff --git a/components/offline_pages/background/mark_attempt_started_task_unittest.cc b/components/offline_pages/background/mark_attempt_completed_task_unittest.cc
similarity index 54%
copy from components/offline_pages/background/mark_attempt_started_task_unittest.cc
copy to components/offline_pages/background/mark_attempt_completed_task_unittest.cc
index 3e770c872a05a393a9bbeee87eadcac9d02f4366..f33ba854c0d4a7cbfdd719ac74ee5f2b59ecdc59 100644
--- a/components/offline_pages/background/mark_attempt_started_task_unittest.cc
+++ b/components/offline_pages/background/mark_attempt_completed_task_unittest.cc
@@ -2,9 +2,10 @@
 // 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/mark_attempt_started_task.h"
+#include "components/offline_pages/background/mark_attempt_completed_task.h"
 
 #include <memory>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/test/test_simple_task_runner.h"
@@ -20,14 +21,14 @@ const GURL kUrl1("http://example.com");
 const ClientId kClientId1("download", "1234");
 }  // namespace
 
-class MarkAttemptStartedTaskTest : public testing::Test {
+class MarkAttemptCompletedTaskTest : public testing::Test {
  public:
-  MarkAttemptStartedTaskTest();
-  ~MarkAttemptStartedTaskTest() override;
+  MarkAttemptCompletedTaskTest();
+  ~MarkAttemptCompletedTaskTest() override;
 
   void PumpLoop();
 
-  void AddItemToStore(RequestQueueStore* store);
+  void AddStartedItemToStore(RequestQueueStore* store);
 
   void AddRequestDone(ItemActionStatus status);
 
@@ -42,62 +43,46 @@ class MarkAttemptStartedTaskTest : public testing::Test {
   base::ThreadTaskRunnerHandle task_runner_handle_;
 };
 
-MarkAttemptStartedTaskTest::MarkAttemptStartedTaskTest()
+MarkAttemptCompletedTaskTest::MarkAttemptCompletedTaskTest()
     : task_runner_(new base::TestSimpleTaskRunner),
       task_runner_handle_(task_runner_) {}
 
-MarkAttemptStartedTaskTest::~MarkAttemptStartedTaskTest() {}
+MarkAttemptCompletedTaskTest::~MarkAttemptCompletedTaskTest() {}
 
-void MarkAttemptStartedTaskTest::PumpLoop() {
+void MarkAttemptCompletedTaskTest::PumpLoop() {
   task_runner_->RunUntilIdle();
 }
 
-void MarkAttemptStartedTaskTest::AddItemToStore(RequestQueueStore* store) {
+void MarkAttemptCompletedTaskTest::AddStartedItemToStore(
+    RequestQueueStore* store) {
   base::Time creation_time = base::Time::Now();
   SavePageRequest request_1(kRequestId1, kUrl1, kClientId1, creation_time,
                             true);
+  request_1.MarkAttemptStarted(base::Time::Now());
   store->AddRequest(request_1,
-                    base::Bind(&MarkAttemptStartedTaskTest::AddRequestDone,
+                    base::Bind(&MarkAttemptCompletedTaskTest::AddRequestDone,
                                base::Unretained(this)));
   PumpLoop();
 }
 
-void MarkAttemptStartedTaskTest::AddRequestDone(ItemActionStatus status) {
+void MarkAttemptCompletedTaskTest::AddRequestDone(ItemActionStatus status) {
   ASSERT_EQ(ItemActionStatus::SUCCESS, status);
 }
 
-void MarkAttemptStartedTaskTest::ChangeRequestsStateCallback(
+void MarkAttemptCompletedTaskTest::ChangeRequestsStateCallback(
     std::unique_ptr<UpdateRequestsResult> result) {
   result_ = std::move(result);
 }
 
-TEST_F(MarkAttemptStartedTaskTest, MarkAttemptStartedWhenStoreEmpty) {
+TEST_F(MarkAttemptCompletedTaskTest, MarkAttemptCompletedWhenExists) {
   RequestQueueInMemoryStore store;
-  MarkAttemptStartedTask task(
-      &store, kRequestId1,
-      base::Bind(&MarkAttemptStartedTaskTest::ChangeRequestsStateCallback,
-                 base::Unretained(this)));
-  task.Run();
-  PumpLoop();
-  ASSERT_TRUE(last_result());
-  EXPECT_EQ(1UL, last_result()->item_statuses.size());
-  EXPECT_EQ(kRequestId1, last_result()->item_statuses.at(0).first);
-  EXPECT_EQ(ItemActionStatus::NOT_FOUND,
-            last_result()->item_statuses.at(0).second);
-  EXPECT_EQ(0UL, last_result()->updated_items.size());
-}
-
-TEST_F(MarkAttemptStartedTaskTest, MarkAttemptStartedWhenExists) {
-  RequestQueueInMemoryStore store;
-  AddItemToStore(&store);
+  AddStartedItemToStore(&store);
 
-  MarkAttemptStartedTask task(
+  MarkAttemptCompletedTask task(
       &store, kRequestId1,
-      base::Bind(&MarkAttemptStartedTaskTest::ChangeRequestsStateCallback,
+      base::Bind(&MarkAttemptCompletedTaskTest::ChangeRequestsStateCallback,
                  base::Unretained(this)));
 
-  // Current time for verification.
-  base::Time before_time = base::Time::Now();
   task.Run();
   PumpLoop();
   ASSERT_TRUE(last_result());
@@ -106,21 +91,19 @@ TEST_F(MarkAttemptStartedTaskTest, MarkAttemptStartedWhenExists) {
   EXPECT_EQ(ItemActionStatus::SUCCESS,
             last_result()->item_statuses.at(0).second);
   EXPECT_EQ(1UL, last_result()->updated_items.size());
-  EXPECT_LE(before_time,
-            last_result()->updated_items.at(0).last_attempt_time());
-  EXPECT_GE(base::Time::Now(),
-            last_result()->updated_items.at(0).last_attempt_time());
-  EXPECT_EQ(1, last_result()->updated_items.at(0).started_attempt_count());
-  EXPECT_EQ(SavePageRequest::RequestState::PRERENDERING,
+  EXPECT_EQ(1, last_result()->updated_items.at(0).completed_attempt_count());
+  EXPECT_EQ(SavePageRequest::RequestState::AVAILABLE,
             last_result()->updated_items.at(0).request_state());
 }
 
-TEST_F(MarkAttemptStartedTaskTest, MarkAttemptStartedWhenItemMissing) {
+TEST_F(MarkAttemptCompletedTaskTest, MarkAttemptCompletedWhenItemMissing) {
   RequestQueueInMemoryStore store;
-  AddItemToStore(&store);
-  MarkAttemptStartedTask task(
+  // Add request 1 to the store.
+  AddStartedItemToStore(&store);
+  // Try to mark request 2 (not in the store).
+  MarkAttemptCompletedTask task(
       &store, kRequestId2,
-      base::Bind(&MarkAttemptStartedTaskTest::ChangeRequestsStateCallback,
+      base::Bind(&MarkAttemptCompletedTaskTest::ChangeRequestsStateCallback,
                  base::Unretained(this)));
   task.Run();
   PumpLoop();