From 7a272a45642ccbf94c00800c9ed4c7c92125c6ae Mon Sep 17 00:00:00 2001
From: Grisha Kruglov <gkruglov@mozilla.com>
Date: Sun, 9 Feb 2020 11:34:39 -0800
Subject: [PATCH] Enable fennec Pinned Sites migration

---
 .../java/org/mozilla/fenix/components/TopSiteStorage.kt   | 8 ++++----
 .../java/org/mozilla/fenix/MigratingFenixApplication.kt   | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/TopSiteStorage.kt b/app/src/main/java/org/mozilla/fenix/components/TopSiteStorage.kt
index 0312a5184..63a16841d 100644
--- a/app/src/main/java/org/mozilla/fenix/components/TopSiteStorage.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/TopSiteStorage.kt
@@ -14,7 +14,7 @@ import org.mozilla.fenix.test.Mockable
 class TopSiteStorage(private val context: Context) {
     var cachedTopSites = listOf<TopSite>()
 
-    private val topSiteStorage by lazy {
+    val storage by lazy {
         TopSiteStorage(context)
     }
 
@@ -22,20 +22,20 @@ class TopSiteStorage(private val context: Context) {
      * Adds a new [TopSite].
      */
     fun addTopSite(title: String, url: String) {
-        topSiteStorage.addTopSite(title, url)
+        storage.addTopSite(title, url)
     }
 
     /**
      * Returns a [LiveData] list of all the [TopSite] instances.
      */
     fun getTopSites(): LiveData<List<TopSite>> {
-        return topSiteStorage.getTopSites()
+        return storage.getTopSites()
     }
 
     /**
      * Removes the given [TopSite].
      */
     fun removeTopSite(topSite: TopSite) {
-        topSiteStorage.removeTopSite(topSite)
+        storage.removeTopSite(topSite)
     }
 }
diff --git a/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt b/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt
index 7caa8d02d..5439fddb6 100644
--- a/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt
+++ b/app/src/migration/java/org/mozilla/fenix/MigratingFenixApplication.kt
@@ -16,7 +16,10 @@ class MigratingFenixApplication : FenixApplication() {
         FennecMigrator.Builder(this, this.components.analytics.crashReporter)
             .migrateOpenTabs(this.components.core.sessionManager)
             .migrateHistory(this.components.core.historyStorage)
-            .migrateBookmarks(this.components.core.bookmarksStorage)
+            .migrateBookmarks(
+                this.components.core.bookmarksStorage,
+                this.components.core.topSiteStorage.storage
+            )
             .migrateLogins(
                 this.components.core.asyncPasswordsStorage,
                 this.components.core.passwordsEncryptionKey