Bug 1450210 - Remove remaining references to the POST data anno. r=standard8

MozReview-Commit-ID: 5AOMj1VBgT7

--HG--
extra : rebase_source : 3b89f4a26e77b37a0da8ff8640af4a648c93b351

toolkit/components/places/Bookmarks.jsm

@@ -1657,17 +1657,11 @@ async function handleBookmarkItemSpecialData(itemId, item) {
     }
   }
   if ("keyword" in item && item.keyword) {
-    // POST data could be set in 2 ways:
-    // 1. new backups have a postData property
-    // 2. old backups have an item annotation
-    let postDataAnno = item.annos &&
-                       item.annos.find(anno => anno.name == PlacesUtils.POST_DATA_ANNO);
-    let postData = item.postData || (postDataAnno && postDataAnno.value);
     try {
       await PlacesUtils.keywords.insert({
         keyword: item.keyword,
         url: item.url,
-        postData,
+        postData: item.postData,
         source: item.source
       });
     } catch (ex) {

toolkit/components/places/PlacesUtils.jsm

@@ -354,7 +354,6 @@ var PlacesUtils = {
 
   LMANNO_FEEDURI: "livemark/feedURI",
   LMANNO_SITEURI: "livemark/siteURI",
-  POST_DATA_ANNO: "bookmarkProperties/POSTData",
   READ_ONLY_ANNO: "placesInternal/READ_ONLY",
   CHARSET_ANNO: "URIProperties/characterSet",
   // Deprecated: This is only used for supporting import from older datasets.

toolkit/components/places/tests/unit/bookmarks.json

@@ -141,14 +141,6 @@
                   "type": 3,
                   "value": "item description"
                 },
-                {
-                  "name": "bookmarkProperties/POSTData",
-                  "flags": 0,
-                  "expires": 4,
-                  "mimeType": null,
-                  "type": 3,
-                  "value": "hidden1%3Dbar&text1%3D%25s"
-                },
                 {
                   "name": "bookmarkProperties/loadInSidebar",
                   "flags": 0,
@@ -161,7 +153,8 @@
               "type": "text/x-moz-place",
               "uri": "http://test/post",
               "keyword": "test",
-              "charset": "ISO-8859-1"
+              "charset": "ISO-8859-1",
+              "postData": "hidden1%3Dbar&text1%3D%25s"
             }
           ]
         }