Fixes to enable indication of bytes downloaded for Offline Pages in Download Home.

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"
 #include "chrome/browser/android/offline_pages/offliner_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/offline_pages/core/background/save_page_request.h"
 #include "components/offline_pages/core/client_namespace_constants.h"
 #include "components/offline_pages/core/downloads/download_ui_adapter.h"
 #include "components/offline_pages/core/offline_page_model.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"
 
 namespace offline_pages {
-namespace {
-const char kDownloadUIAdapterKey[] = "download-ui-adapter";
-}
 
 PrerenderingOffliner::PrerenderingOffliner(
     content::BrowserContext* browser_context,
     const OfflinerPolicy* policy,
     OfflinePageModel* offline_page_model)
     : browser_context_(browser_context),
       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 = static_cast<DownloadUIAdapter*>(
-      offline_page_model_->GetUserData(kDownloadUIAdapterKey));
-
+  DownloadUIAdapter* ui_adapter =
+      DownloadUIAdapter::FromOfflinePageModel(offline_page_model_);

[Pete Williamson, 2017/02/27 16:13:56]

Should we be making a similar change to the background loader offliner?

[fgorski, 2017/02/27 16:22:55]

Yes, if similar implementation is in place it causes trouble.

[Dmitry Titov, 2017/02/27 20:02:17]

If you mean adding the ability for Background Loader to report network bytes,
this is not yet implemented and Cathy is looking into this. It will be using a
different mechanism because there is no prerenderer.

   if (!ui_adapter)
     return;
 
   ui_adapter->UpdateProgress(request.request_id(), bytes);
 }
 
 void PrerenderingOffliner::OnLoadPageDone(
     const SavePageRequest& request,
     Offliner::RequestStatus load_status,
     content::WebContents* web_contents) {
@@ skipping 202 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