Simplify Observer callbacks

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 112 matching lines @@
   }
 
  private:
   std::unique_ptr<OfflinerStub> offliner_;
 };
 
 class ObserverStub : public RequestCoordinator::Observer {
  public:
   ObserverStub()
       : added_called_(false),
-        succeeded_called_(false),
-        failed_called_(false),
+        completed_called_(false),
         changed_called_(false),
-        removed_called_(false),
+        last_status_(RequestCoordinator::SavePageStatus::SUCCESS),
+        previous_status_(RequestCoordinator::SavePageStatus::SUCCESS),
         state_(SavePageRequest::RequestState::PRERENDERING) {}
 
   void Clear() {
     added_called_ = false;
-    succeeded_called_ = false;
-    failed_called_ = false;
+    completed_called_ = false;
     changed_called_ = false;
-    removed_called_ = false;
     state_ = SavePageRequest::RequestState::PRERENDERING;
+    last_status_ = RequestCoordinator::SavePageStatus::SUCCESS;
+    previous_status_ = RequestCoordinator::SavePageStatus::SUCCESS;
   }
 
   void OnAdded(const SavePageRequest& request) override {
     added_called_ = true;
   }
 
-  void OnSucceeded(const SavePageRequest& request) override {
-    succeeded_called_ = true;
-  }
-
-  void OnFailed(const SavePageRequest& request,
-                RequestCoordinator::SavePageStatus status) override {
-    failed_called_ = true;
+  void OnCompleted(const SavePageRequest& request,
+                   RequestCoordinator::SavePageStatus status) override {
+    completed_called_ = true;
+    previous_status_ = last_status_;
+    last_status_ = status;
   }
 
   void OnChanged(const SavePageRequest& request) override {
     changed_called_ = true;
     state_ = request.request_state();
   }
 
-  void OnRemoved(const SavePageRequest& request,
-                 RequestCoordinator::SavePageStatus status) override {
-    removed_called_ = true;
+  bool added_called() { return added_called_; }
+  bool completed_called() { return completed_called_; }
+  bool changed_called() { return changed_called_; }
+  RequestCoordinator::SavePageStatus last_status() { return last_status_; }
+  RequestCoordinator::SavePageStatus previous_status() {
+    return previous_status_;
   }
-
-  bool added_called() { return added_called_; }
-  bool succeeded_called() { return succeeded_called_; }
-  bool failed_called() { return failed_called_; }
-  bool changed_called() { return changed_called_; }
-  bool removed_called() { return removed_called_; }
   SavePageRequest::RequestState state() { return state_; }
 
  private:
   bool added_called_;
-  bool succeeded_called_;
-  bool failed_called_;
+  bool completed_called_;
   bool changed_called_;
-  bool removed_called_;
+  RequestCoordinator::SavePageStatus last_status_;
+  RequestCoordinator::SavePageStatus previous_status_;
   SavePageRequest::RequestState state_;
 };
 
 class RequestCoordinatorTest
     : public testing::Test {
  public:
   RequestCoordinatorTest();
   ~RequestCoordinatorTest() override;
 
   void SetUp() override;
@@ skipping 226 matching lines @@
   // Verify the request gets removed from the queue, and wait for callbacks.
   coordinator()->queue()->GetRequests(
       base::Bind(&RequestCoordinatorTest::GetRequestsDone,
                  base::Unretained(this)));
   PumpLoop();
 
   // We should not find any requests in the queue anymore.
   // RequestPicker should *not* have tried to start an additional job,
   // because the request queue is empty now.
   EXPECT_EQ(0UL, last_requests().size());
-  // Check that the observer got the notification that we succeeded.
-  EXPECT_TRUE(observer().succeeded_called());
+  // Check that the observer got the notification that we succeeded, and that
+  // the request got removed from the queue.
+  EXPECT_TRUE(observer().completed_called());
+  EXPECT_EQ(RequestCoordinator::SavePageStatus::SUCCESS,
+            observer().previous_status());
+  EXPECT_EQ(RequestCoordinator::SavePageStatus::REMOVED,
+            observer().last_status());
 }
 
 TEST_F(RequestCoordinatorTest, OfflinerDoneRequestFailed) {
   // Add a request to the queue, wait for callbacks to finish.
   offline_pages::SavePageRequest request(
       kRequestId1, kUrl1, kClientId1, base::Time::Now(), kUserRequested);
   request.MarkAttemptStarted(base::Time::Now());
   coordinator()->queue()->AddRequest(
       request,
       base::Bind(&RequestCoordinatorTest::AddRequestDone,
@@ skipping 34 matching lines @@
 
   // Verify neither request is removed from the queue; wait for callbacks.
   coordinator()->queue()->GetRequests(
       base::Bind(&RequestCoordinatorTest::GetRequestsDone,
                  base::Unretained(this)));
   PumpLoop();
 
   // Now just one request in the queue since failed request removed
   // (for single attempt policy).
   EXPECT_EQ(1UL, last_requests().size());
-  // Check that the observer got the notification that we failed
-  EXPECT_TRUE(observer().failed_called());
+  // Check that the observer got the notification that we failed (and the
+  // subsequent notification that the request was removed).
+  EXPECT_TRUE(observer().completed_called());
+  EXPECT_EQ(RequestCoordinator::SavePageStatus::RETRY_COUNT_EXCEEDED,
+            observer().previous_status());
+  EXPECT_EQ(RequestCoordinator::SavePageStatus::REMOVED,
+            observer().last_status());
 }
 
 TEST_F(RequestCoordinatorTest, OfflinerDoneForegroundCancel) {
   // Add a request to the queue, wait for callbacks to finish.
   offline_pages::SavePageRequest request(
       kRequestId1, kUrl1, kClientId1, base::Time::Now(), kUserRequested);
   request.MarkAttemptStarted(base::Time::Now());
   coordinator()->queue()->AddRequest(
       request, base::Bind(&RequestCoordinatorTest::AddRequestDone,
                           base::Unretained(this)));
@@ skipping 260 matching lines @@
       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);
   PumpLoop();
 
-  EXPECT_TRUE(observer().removed_called());
+  EXPECT_TRUE(observer().completed_called());
+  EXPECT_EQ(RequestCoordinator::SavePageStatus::REMOVED,
+            observer().last_status());
 }
 
 }  // namespace offline_pages