Backed out changeset 96ecba4a2327 (bug 1329752) for Windows build bustage due to attempted string conversion ins nsAppRunner.cpp. r=backout on a CLOSED TREE

toolkit/xre/nsAppRunner.cpp

@@ -4935,12 +4935,10 @@ MultiprocessBlockPolicy() {
    * Avoids enabling e10s for Windows XP users on the release channel.
    */
 #if defined(XP_WIN)
-  if (!IsVistaOrLater()) {
-    nsAdoptingString channelName = Preferences::GetDefaultCString("app.update.channel");
-    if (channelName.EqualsLiteral("release") || channelName.EqualsLiteral("esr")) {
-      gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem;
-      return gMultiprocessBlockPolicy;
-    }
+  if (Preferences::GetDefaultCString("app.update.channel").EqualsLiteral("release") &&
+      !IsVistaOrLater()) {
+    gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem;
+    return gMultiprocessBlockPolicy;
   }
 #endif // XP_WIN