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

chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.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/downloads/offline_page_download_bridge.h"
 
 #include <vector>
 
 #include "base/android/jni_string.h"
 #include "base/bind.h"
@@ skipping 24 matching lines @@
 #include "url/gurl.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 
-namespace {
-const char kDownloadUIAdapterKey[] = "download-ui-adapter";
-}
-
 namespace offline_pages {
 namespace android {
 
 namespace {
 
 class DownloadUIAdapterDelegate : public DownloadUIAdapter::Delegate {
  public:
   explicit DownloadUIAdapterDelegate(OfflinePageModel* model);
 
   // DownloadUIAdapter::Delegate
@@ skipping 410 matching lines @@
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
                   const JavaParamRef<jobject>& j_profile) {
   content::BrowserContext* browser_context =
       ProfileAndroid::FromProfileAndroid(j_profile);
 
   OfflinePageModel* offline_page_model =
       OfflinePageModelFactory::GetForBrowserContext(browser_context);
   DCHECK(offline_page_model);
 
-  DownloadUIAdapter* adapter = static_cast<DownloadUIAdapter*>(
-      offline_page_model->GetUserData(kDownloadUIAdapterKey));
+  DownloadUIAdapter* adapter =
+      DownloadUIAdapter::FromOfflinePageModel(offline_page_model);
 
   if (!adapter) {
     RequestCoordinator* request_coordinator =
         RequestCoordinatorFactory::GetForBrowserContext(browser_context);
     DCHECK(request_coordinator);
     adapter = new DownloadUIAdapter(
         offline_page_model, request_coordinator,
         base::MakeUnique<DownloadUIAdapterDelegate>(offline_page_model));
-    offline_page_model->SetUserData(kDownloadUIAdapterKey, adapter);
+    DownloadUIAdapter::AttachToOfflinePageModel(adapter, offline_page_model);
   }
 
   return reinterpret_cast<jlong>(
       new OfflinePageDownloadBridge(env, obj, adapter, browser_context));
 }
 
 }  // namespace android
 }  // namespace offline_pages