mozilla-inbound: changeset 341293:5a9559ded976666b28e3cbd28c5ca4d0ebf7cff0

☠☠ backed out by cddb9e197d81 ☠ ☠
author	Wes Kocher <wkocher@mozilla.com>
	Tue, 07 Feb 2017 12:25:04 -0800
changeset 341293	5a9559ded976666b28e3cbd28c5ca4d0ebf7cff0
parent 341292	de2b0d90e2dafb22885e63e58a498525e340badc
child 341294	cddb9e197d816c2167bf49222e4b83745efce653
push id	86684
push user	cbook@mozilla.com
push date	Wed, 08 Feb 2017 10:31:03 +0000
treeherder	mozilla-inbound@c5b88e4e70f4 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bustage
bugs	1335983
milestone	54.0a1
first release with	nightly linux32 3a95aa424665 / 54.0a1 / 20170208110248 / files nightly linux64 3a95aa424665 / 54.0a1 / 20170208110248 / files nightly mac 3a95aa424665 / 54.0a1 / 20170208030203 / files nightly win32 3a95aa424665 / 54.0a1 / 20170208030203 / files nightly win64 3a95aa424665 / 54.0a1 / 20170208030203 / files
last release without	nightly linux32 af8a2573d0f1 / 54.0a1 / 20170207110148 / files nightly linux64 af8a2573d0f1 / 54.0a1 / 20170207110148 / files nightly mac af8a2573d0f1 / 54.0a1 / 20170207030214 / files nightly win32 af8a2573d0f1 / 54.0a1 / 20170207030214 / files nightly win64 af8a2573d0f1 / 54.0a1 / 20170207030214 / files

--- a/dom/xul/templates/nsXULContentUtils.cpp
+++ b/dom/xul/templates/nsXULContentUtils.cpp
@@ -118,18 +118,16 @@ nsXULContentUtils::Finish()
 
     return NS_OK;
 }
 
 nsICollation*
 nsXULContentUtils::GetCollation()
 {
     if (!gCollation) {
-        nsresult rv;
-
         nsCOMPtr<nsICollationFactory> colFactory =
             do_CreateInstance(NS_COLLATIONFACTORY_CONTRACTID);
         if (colFactory) {
             rv = colFactory->CreateCollation(&gCollation);
             NS_ASSERTION(NS_SUCCEEDED(rv),
                          "couldn't create collation instance");
         } else
             NS_ERROR("couldn't create instance of collation factory");