Fix the Download Notifications for Offline Pages to indicate bytes loaded.

chrome/browser/android/offline_pages/prerendering_offliner.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 "chrome/browser/android/offline_pages/prerendering_offliner.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/sys_info.h"
 #include "chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h"
@@ skipping 18 matching lines @@
       offline_page_model_(offline_page_model),
       pending_request_(nullptr),
       is_low_end_device_(base::SysInfo::IsLowEndDevice()),
       app_listener_(nullptr),
       weak_ptr_factory_(this) {}
 
 PrerenderingOffliner::~PrerenderingOffliner() {}
 
 void PrerenderingOffliner::OnNetworkProgress(const SavePageRequest& request,
                                              int64_t bytes) {
-  if (!pending_request_)
-    return;
-  DownloadUIAdapter* ui_adapter =
-      DownloadUIAdapter::FromOfflinePageModel(offline_page_model_);
-  if (!ui_adapter)
+  if (!pending_request_ || !progress_callback_)
     return;
 
-  ui_adapter->UpdateProgress(request.request_id(), bytes);
+  progress_callback_.Run(request, bytes);
 }
 
 void PrerenderingOffliner::OnLoadPageDone(
     const SavePageRequest& request,
     Offliner::RequestStatus load_status,
     content::WebContents* web_contents) {
   // Check if request is still pending receiving a callback.
   // Note: it is possible to get a loaded page, start the save operation,
   // and then get another callback from the Loader (eg, if its loaded
   // WebContents is being destroyed for some resource reclamation).
@@ skipping 67 matching lines @@
   if (save_result == SavePageResult::SUCCESS) {
     save_status = RequestStatus::SAVED;
   } else {
     // TODO(dougarnett): Consider reflecting some recommendation to retry the
     // request based on specific save error cases.
     save_status = RequestStatus::SAVE_FAILED;
   }
   completion_callback_.Run(request, save_status);
 }
 
-bool PrerenderingOffliner::LoadAndSave(const SavePageRequest& request,
-                                       const CompletionCallback& callback) {
+bool PrerenderingOffliner::LoadAndSave(
+    const SavePageRequest& request,
+    const CompletionCallback& completion_callback,
+    const ProgressCallback& progress_callback) {
   DCHECK(!pending_request_.get());
 
   if (pending_request_) {
     DVLOG(1) << "Already have pending request";
     return false;
   }
 
   // Do not allow loading for custom tabs clients if 3rd party cookies blocked.
   // TODO(dewittj): Revise api to specify policy rather than hard code to
   // name_space.
@@ skipping 37 matching lines @@
         1);
   }
 
   if (!OfflinePageModel::CanSaveURL(request.url())) {
     DVLOG(1) << "Not able to save page for requested url: " << request.url();
     return false;
   }
 
   // Track copy of pending request for callback handling.
   pending_request_.reset(new SavePageRequest(request));
-  completion_callback_ = callback;
+  completion_callback_ = completion_callback;
+  progress_callback_ = progress_callback;
 
   // Kick off load page attempt.
   bool accepted = GetOrCreateLoader()->LoadPage(
       request.url(), base::Bind(&PrerenderingOffliner::OnLoadPageDone,
                                 weak_ptr_factory_.GetWeakPtr(), request),
       base::Bind(&PrerenderingOffliner::OnNetworkProgress,
                  weak_ptr_factory_.GetWeakPtr(), request));
   if (!accepted) {
     pending_request_.reset(nullptr);
   } else {
@@ skipping 67 matching lines @@
           base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES) {
     DVLOG(1) << "App became active, canceling current offlining request";
     SavePageRequest* request = pending_request_.get();
     Cancel();
     completion_callback_.Run(*request,
                              Offliner::RequestStatus::FOREGROUND_CANCELED);
   }
 }
 
 }  // namespace offline_pages