Backed out changeset ee44f7dc5f2b (bug 1547595) for browser_removeUnsafeProtocolsFromURLBarPaste.js failures CLOSED TREE

browser/components/urlbar/tests/browser/browser.ini

@@ -131,6 +131,7 @@ run-if = e10s
 [browser_remotetab.js]
 [browser_remove_match.js]
 [browser_removeUnsafeProtocolsFromURLBarPaste.js]
+fail-if = (os == 'linux' && os_version == '18.04')  # Bug 1600182
 [browser_restoreEmptyInput.js]
 [browser_resultSpan.js]
 [browser_retainedResultsOnFocus.js]

widget/gtk/nsClipboard.cpp

@@ -522,16 +522,8 @@ void nsClipboard::SelectionGetEvent(GtkClipboard* aClipboard,
     NS_ConvertUTF16toUTF8 utf8string(ucs2string);
 
     LOGCLIP(("  sent %d bytes of utf-8 data\n", utf8string.Length()));
-    if (selectionTarget == gdk_atom_intern("text/plain;charset=utf-8", FALSE)) {
-      // Bypass gtk_selection_data_set_text, which will convert \n to \r\n
-      // in some versions of GTK.
-      gtk_selection_data_set(aSelectionData, selectionTarget, 8,
-                             reinterpret_cast<const guchar*>(utf8string.get()),
-                             utf8string.Length());
-    } else {
-      gtk_selection_data_set_text(aSelectionData, utf8string.get(),
-                                  utf8string.Length());
-    }
+    gtk_selection_data_set_text(aSelectionData, utf8string.get(),
+                                utf8string.Length());
     return;
   }