Bug 561229 - Copy/Paste bookmarks is broken. r=dietrich

browser/components/places/content/controller.js

@@ -1181,7 +1181,7 @@ PlacesController.prototype = {
           copiedFolders.push(node);
         
         function generateChunk(type, overrideURI) {
-          let suffix = i < (nodes.length - 1) ? NEWLINE : "";
+          let suffix = i < (nodes.length - 1) ? PlacesUtils.endl : "";
           let uri = overrideURI;
         
           if (PlacesUtils.nodeIsLivemarkContainer(node))

browser/components/places/src/PlacesUIUtils.jsm

@@ -59,15 +59,6 @@ XPCOMUtils.defineLazyGetter(this, "PlacesUtils", function() {
   return PlacesUtils;
 });
 
-#ifdef XP_MACOSX
-// On Mac OSX, the transferable system converts "\r\n" to "\n\n", where we
-// really just want "\n".
-const NEWLINE= "\n";
-#else
-// On other platforms, the transferable system converts "\r\n" to "\n".
-const NEWLINE = "\r\n";
-#endif
-
 var PlacesUIUtils = {
   ORGANIZER_LEFTPANE_VERSION: 6,
   ORGANIZER_FOLDER_ANNO: "PlacesOrganizer/OrganizerFolder",

toolkit/components/places/src/PlacesUtils.jsm

@@ -128,6 +128,8 @@ var PlacesUtils = {
   asContainer: function(aNode) asContainer(aNode),
   asQuery: function(aNode) asQuery(aNode),
 
+  endl: NEWLINE,
+
   /**
    * Makes a URI from a spec.
    * @param   aSpec