[Offline pages] Adapting OfflinePageDownloadBridge to DownloadUIAdapter

chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.h

Index: chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.h
diff --git a/chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.h b/chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.h
index c5c5a66414bfb04b5f9bf4ea98b9e0d770235393..faf329012eaea4b0186abec98715c27de5023045 100644
--- a/chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.h
+++ b/chrome/browser/android/offline_pages/downloads/offline_page_download_bridge.h
@@ -11,8 +11,9 @@
 #include "base/android/jni_weak_ref.h"
 #include "base/macros.h"
 #include "base/supports_user_data.h"
-#include "components/offline_pages/offline_page_item.h"
-#include "components/offline_pages/offline_page_model.h"
+#include "components/offline_pages/downloads/download_ui_adapter.h"
+
+using offline_pages::DownloadUIAdapter;

[fgorski, 2016/07/26 22:23:13]

nit: remove this.

 
 namespace content {
 class BrowserContext;
@@ -25,12 +26,12 @@ namespace android {
  * Bridge between C++ and Java for exposing native implementation of offline
  * pages model in managed code.
  */
-class OfflinePageDownloadBridge {
+class OfflinePageDownloadBridge : public DownloadUIAdapter::Observer {
  public:
   OfflinePageDownloadBridge(JNIEnv* env,
                             const base::android::JavaParamRef<jobject>& obj,
-                            content::BrowserContext* browser_context);
-  ~OfflinePageDownloadBridge();
+                            DownloadUIAdapter* download_ui_adapter);
+  ~OfflinePageDownloadBridge() override;
 
   static bool Register(JNIEnv* env);
 
@@ -45,14 +46,18 @@ class OfflinePageDownloadBridge {
       const base::android::JavaParamRef<jobject>& obj,
       const base::android::JavaParamRef<jstring>& j_guid);
 
-  void OnOfflinePageDownloadBridgeLoaded();
-  void OnOfflinePageDownloadItemAdded(const OfflinePageItem& item);
-  void OnOfflinePageDownloadItemDeleted(const std::string& guid);
-  void OnOfflinePageDownloadItemUpdated(const OfflinePageItem& item);
+  // DownloadUIAdapter::Observer implementation.
+  void ItemsLoaded() override;
+  void ItemAdded(const DownloadUIItem& item) override;
+  void ItemUpdated(const DownloadUIItem& item) override;
+  void ItemDeleted(const std::string& guid) override;
 
  private:
   JavaObjectWeakGlobalRef weak_java_ref_;
 
+  // Not owned.
+  DownloadUIAdapter* download_ui_adapter_;
+
   DISALLOW_COPY_AND_ASSIGN(OfflinePageDownloadBridge);
 };