[OfflinePages] Call NotifyInterrupted for pending requests

components/offline_pages/downloads/download_notifying_observer.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 "components/offline_pages/background/request_coordinator.h"
 #include "components/offline_pages/background/save_page_request.h"
 #include "components/offline_pages/client_policy_controller.h"
 #include "components/offline_pages/downloads/download_ui_adapter.h"
@@ skipping 26 matching lines @@
   DCHECK(request_coordinator);
   DCHECK(notifier.get());
   DownloadNotifyingObserver* observer = new DownloadNotifyingObserver(
       std::move(notifier), request_coordinator->GetPolicyController());
   request_coordinator->AddObserver(observer);
   // |request_coordinator| takes ownership of observer here.
   request_coordinator->SetUserData(&kUserDataKey, observer);
 }
 
 void DownloadNotifyingObserver::OnAdded(const SavePageRequest& request) {
-  DCHECK(notifier_.get());
-  if (!IsVisibleInUI(request.client_id()))
-    return;
-  notifier_->NotifyDownloadProgress(DownloadUIItem(request));
+  // Same notifier update as for OnChanged.
+  OnChanged(request);

[dougarnett, 2016/11/28 21:33:26]

Hmm, actually this didn't work. Seems that we need to do a Progress first at our
level or handle Interrupted differently in notifier. 

[dougarnett, 2016/11/28 22:18:49]

Here is one approach at this level to affect the creation of the notification
and updating it to Pending if appropriate.

Min, do you have a suggestion for better handling at  SystemDownloadNotifier
level? 

 }
 
 void DownloadNotifyingObserver::OnChanged(const SavePageRequest& request) {
   DCHECK(notifier_.get());
   if (!IsVisibleInUI(request.client_id()))
     return;
   if (request.request_state() == SavePageRequest::RequestState::PAUSED)
     notifier_->NotifyDownloadPaused(DownloadUIItem(request));
+  else if (request.request_state() == SavePageRequest::RequestState::AVAILABLE)
+    notifier_->NotifyDownloadInterrupted(DownloadUIItem(request));
   else
     notifier_->NotifyDownloadProgress(DownloadUIItem(request));
 }
 
 void DownloadNotifyingObserver::OnCompleted(
     const SavePageRequest& request,
     RequestCoordinator::BackgroundSavePageResult status) {
   DCHECK(notifier_.get());
   if (!IsVisibleInUI(request.client_id()))
     return;
   if (status == RequestCoordinator::BackgroundSavePageResult::SUCCESS)
     notifier_->NotifyDownloadSuccessful(DownloadUIItem(request));
   else if (status == RequestCoordinator::BackgroundSavePageResult::REMOVED)
     notifier_->NotifyDownloadCanceled(DownloadUIItem(request));
   else
     notifier_->NotifyDownloadFailed(DownloadUIItem(request));
 }
 
 bool DownloadNotifyingObserver::IsVisibleInUI(const ClientId& page) {
   return policy_controller_->IsSupportedByDownload(page.name_space) &&
          base::IsValidGUID(page.id);
 }
 
 }  // namespace offline_pages