Adding upstream version 124.0.1.upstream/124.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 101 insertions, 0 deletions

diff --git a/toolkit/components/places/tests/unit/mobile_bookmarks_folder_merge.json b/toolkit/components/places/tests/unit/mobile_bookmarks_folder_merge.json
new file mode 100644
index 0000000000..8d376bf69c
--- /dev/null
+++ b/toolkit/components/places/tests/unit/mobile_bookmarks_folder_merge.json
@@ -0,0 +1,101 @@
+{
+  "guid": "root________",
+  "title": "",
+  "index": 0,
+  "dateAdded": 1475084731479000,
+  "lastModified": 1475084731479000,
+  "id": 1,
+  "type": "text/x-moz-place-container",
+  "root": "placesRoot",
+  "children": [
+    {
+      "guid": "menu________",
+      "title": "Bookmarks Menu",
+      "index": 0,
+      "dateAdded": 1475084731479000,
+      "lastModified": 1475084731768000,
+      "id": 2,
+      "type": "text/x-moz-place-container",
+      "root": "bookmarksMenuFolder",
+      "children": [
+        {
+          "guid": "Utodo9b0oVws",
+          "title": "Firefox Accounts",
+          "index": 0,
+          "dateAdded": 1475084731955000,
+          "lastModified": 1475084731955000,
+          "id": 3,
+          "type": "text/x-moz-place",
+          "uri": "https://accounts.firefox.com/"
+        }
+      ]
+    },
+    {
+      "guid": "toolbar_____",
+      "title": "Bookmarks Toolbar",
+      "index": 1,
+      "dateAdded": 1475084731479000,
+      "lastModified": 1475084731742000,
+      "id": 4,
+      "type": "text/x-moz-place-container",
+      "root": "toolbarFolder"
+    },
+    {
+      "guid": "3qmd_imziEBE",
+      "title": "Mobile Bookmarks",
+      "index": 5,
+      "dateAdded": 1475084731479000,
+      "lastModified": 1475084731770000,
+      "id": 5,
+      "annos": [
+        {
+          "name": "mobile/bookmarksRoot",
+          "flags": 0,
+          "expires": 4,
+          "value": 1
+        },
+        {
+          "name": "bookmarkProperties/description",
+          "flags": 0,
+          "expires": 4,
+          "mimeType": null,
+          "type": 3,
+          "value": "A description of the mobile folder that should be ignored on import"
+        }
+      ],
+      "type": "text/x-moz-place-container",
+      "children": [
+        {
+          "guid": "a17yW6-nTxEJ",
+          "title": "Mozilla",
+          "index": 0,
+          "dateAdded": 1475084731959000,
+          "lastModified": 1475084731959000,
+          "id": 6,
+          "type": "text/x-moz-place",
+          "uri": "https://mozilla.org/"
+        },
+        {
+          "guid": "xV10h9Wi3FBM",
+          "title": "Bugzilla",
+          "index": 1,
+          "dateAdded": 1475084731961000,
+          "lastModified": 1475084731961000,
+          "id": 7,
+          "type": "text/x-moz-place",
+          "uri": "https://bugzilla.mozilla.org/"
+        }
+      ]
+    },
+    {
+      "guid": "unfiled_____",
+      "title": "Other Bookmarks",
+      "index": 3,
+      "dateAdded": 1475084731479000,
+      "lastModified": 1475084731742000,
+      "id": 8,
+      "type": "text/x-moz-place-container",
+      "root": "unfiledBookmarksFolder"
+    }
+  ]
+}