[OfflinePages] Call NotifyInterrupted for pending requests

components/offline_pages/downloads/download_notifying_observer_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/downloads/download_notifying_observer.h"
 
 #include "base/memory/ptr_util.h"
 #include "components/offline_pages/background/save_page_request.h"
 #include "components/offline_pages/client_namespace_constants.h"
 #include "components/offline_pages/client_policy_controller.h"
@@ skipping 110 matching lines @@
 DownloadNotifyingObserverTest::~DownloadNotifyingObserverTest() {}
 
 void DownloadNotifyingObserverTest::SetUp() {
   std::unique_ptr<TestNotifier> notifier(new TestNotifier);
   policy_controller_.reset(new ClientPolicyController());
   notifier_ = notifier.get();
   observer_.reset(new DownloadNotifyingObserver(std::move(notifier),
                                                 policy_controller_.get()));
 }
 
-TEST_F(DownloadNotifyingObserverTest, OnAdded) {
+TEST_F(DownloadNotifyingObserverTest, OnAddedAsAvailable) {
   SavePageRequest request(kTestOfflineId, GURL(kTestUrl), kTestClientId,
                           kTestCreationTime, kTestUserRequested);
+  request.set_request_state(SavePageRequest::RequestState::AVAILABLE);
+  observer()->OnAdded(request);
+  EXPECT_EQ(LastNotificationType::DOWNLOAD_INTERRUPTED,
+            notifier()->last_notification_type());
+  EXPECT_EQ(kTestGuid, notifier()->download_item()->guid);
+  EXPECT_EQ(GURL(kTestUrl), notifier()->download_item()->url);
+  EXPECT_EQ(kTestCreationTime, notifier()->download_item()->start_time);
+}
+
+TEST_F(DownloadNotifyingObserverTest, OnAddedAsOffling) {

[fgorski, 2016/11/29 17:50:59]

Technically nothing prevents us from adding as paused. Can you please add a test
for it?

And if you think it should be impossible, add a test and code that prevents it.
I think we should at least document the capability (with test) even if we never
use it.

[dougarnett, 2016/11/29 20:43:30]

Done.

+  SavePageRequest request(kTestOfflineId, GURL(kTestUrl), kTestClientId,
+                          kTestCreationTime, kTestUserRequested);
+  request.set_request_state(SavePageRequest::RequestState::OFFLINING);
   observer()->OnAdded(request);
   EXPECT_EQ(LastNotificationType::DOWNLOAD_PROGRESS,
             notifier()->last_notification_type());
   EXPECT_EQ(kTestGuid, notifier()->download_item()->guid);
   EXPECT_EQ(GURL(kTestUrl), notifier()->download_item()->url);
   EXPECT_EQ(kTestCreationTime, notifier()->download_item()->start_time);
 }
 
 TEST_F(DownloadNotifyingObserverTest, OnChangedToPaused) {
   SavePageRequest request(kTestOfflineId, GURL(kTestUrl), kTestClientId,
                           kTestCreationTime, kTestUserRequested);
   request.set_request_state(SavePageRequest::RequestState::PAUSED);
   observer()->OnChanged(request);
   EXPECT_EQ(LastNotificationType::DOWNLOAD_PAUSED,
             notifier()->last_notification_type());
   EXPECT_EQ(kTestGuid, notifier()->download_item()->guid);
   EXPECT_EQ(GURL(kTestUrl), notifier()->download_item()->url);
   EXPECT_EQ(kTestCreationTime, notifier()->download_item()->start_time);
 }
 
 TEST_F(DownloadNotifyingObserverTest, OnChangedToAvailable) {
   SavePageRequest request(kTestOfflineId, GURL(kTestUrl), kTestClientId,
                           kTestCreationTime, kTestUserRequested);
   request.set_request_state(SavePageRequest::RequestState::AVAILABLE);
   observer()->OnChanged(request);
+  EXPECT_EQ(LastNotificationType::DOWNLOAD_INTERRUPTED,
+            notifier()->last_notification_type());
+  EXPECT_EQ(kTestGuid, notifier()->download_item()->guid);
+  EXPECT_EQ(GURL(kTestUrl), notifier()->download_item()->url);
+  EXPECT_EQ(kTestCreationTime, notifier()->download_item()->start_time);
+}
+
+TEST_F(DownloadNotifyingObserverTest, OnChangedToOfflining) {
+  SavePageRequest request(kTestOfflineId, GURL(kTestUrl), kTestClientId,
+                          kTestCreationTime, kTestUserRequested);
+  request.set_request_state(SavePageRequest::RequestState::OFFLINING);
+  observer()->OnChanged(request);
   EXPECT_EQ(LastNotificationType::DOWNLOAD_PROGRESS,
             notifier()->last_notification_type());
   EXPECT_EQ(kTestGuid, notifier()->download_item()->guid);
   EXPECT_EQ(GURL(kTestUrl), notifier()->download_item()->url);
   EXPECT_EQ(kTestCreationTime, notifier()->download_item()->start_time);
 }
 
 TEST_F(DownloadNotifyingObserverTest, OnCompletedSuccess) {
   SavePageRequest request(kTestOfflineId, GURL(kTestUrl), kTestClientId,
                           kTestCreationTime, kTestUserRequested);
@@ skipping 73 matching lines @@
   for (auto name_space : name_spaces) {
     ClientId invisible_client_id(name_space, kTestGuid);
     SavePageRequest request(kTestOfflineId, GURL(kTestUrl), invisible_client_id,
                             kTestCreationTime, kTestUserRequested);
     observer()->OnAdded(request);
     EXPECT_EQ(LastNotificationType::NONE, notifier()->last_notification_type());
   }
 }
 
 }  // namespace offline_pages