From b553c841fc9e6a3e4c5bf52243b9c24bd63b2ec8 Mon Sep 17 00:00:00 2001
From: Tarik Eshaq <teshaq@mozilla.com>
Date: Sun, 4 Dec 2022 12:56:23 -0500
Subject: [PATCH] Removes migrate bookmarks to places db

---
 Providers/Profile.swift       |  4 ----
 Storage/Rust/RustPlaces.swift | 33 ---------------------------------
 2 files changed, 37 deletions(-)

diff --git a/Providers/Profile.swift b/Providers/Profile.swift
index b8e9004b4fe6..9615c1129753 100644
--- a/Providers/Profile.swift
+++ b/Providers/Profile.swift
@@ -355,10 +355,6 @@ open class BrowserProfile: Profile {
         log.debug("Reopening profile.")
         isShutdown = false
 
-        if !places.isOpen && !RustFirefoxAccounts.shared.hasAccount() {
-            places.migrateBookmarksIfNeeded(fromBrowserDB: database)
-        }
-
         database.reopenIfClosed()
         _ = logins.reopenIfClosed()
         _ = places.reopenIfClosed()
diff --git a/Storage/Rust/RustPlaces.swift b/Storage/Rust/RustPlaces.swift
index fa89a346fd15..3e6e0b257b71 100644
--- a/Storage/Rust/RustPlaces.swift
+++ b/Storage/Rust/RustPlaces.swift
@@ -135,39 +135,6 @@ public class RustPlaces: BookmarksHandler, HistoryMetadataObserver {
         return deferred
     }
 
-    public func migrateBookmarksIfNeeded(fromBrowserDB browserDB: BrowserDB) {
-        // Since we use the existence of places.db as an indication that we've
-        // already migrated bookmarks, assert that places.db is not open here.
-        assert(!isOpen, "Shouldn't attempt to migrate bookmarks after opening Rust places.db")
-
-        // We only need to migrate bookmarks here if the old browser.db file
-        // already exists AND the new Rust places.db file does NOT exist yet.
-        // This is to ensure that we only ever run this migration ONCE. In
-        // addition, it is the caller's (Profile.swift) responsibility to NOT
-        // use this migration API for users signed into a Firefox Account.
-        // Those users will automatically get all their bookmarks on next Sync.
-        guard FileManager.default.fileExists(atPath: browserDB.databasePath),
-            !FileManager.default.fileExists(atPath: databasePath) else {
-            return
-        }
-
-        // Ensure that the old BrowserDB schema is up-to-date before migrating.
-        _ = browserDB.touch().value
-
-        // Open the Rust places.db now for the first time.
-        _ = reopenIfClosed()
-
-        do {
-            try api?.migrateBookmarksFromBrowserDb(path: browserDB.databasePath)
-        } catch let err as NSError {
-            SentryIntegration.shared.sendWithStacktrace(
-                message: "Error encountered while migrating bookmarks from BrowserDB",
-                tag: SentryTag.rustPlaces,
-                severity: .error,
-                description: err.localizedDescription)
-        }
-    }
-
     public func getBookmarksTree(rootGUID: GUID, recursive: Bool) -> Deferred<Maybe<BookmarkNodeData?>> {
         return withReader { connection in
             return try connection.getBookmarksTree(rootGUID: rootGUID, recursive: recursive)