From 4c832dd2e9a9b4ecc1b07d14247af28fcf073ba3 Mon Sep 17 00:00:00 2001
From: Nigel Babu <nigelbabu@gmail.com>
Date: Wed, 9 Sep 2015 09:12:24 +0530
Subject: [PATCH] Backed out changeset 9f3adfd2ca52 (bug 815299) for M4
 bustage.

---
 dom/workers/test/serviceworkers/fetch/fetch_tests.js | 3 ---
 dom/workers/test/xhr_headers_server.sjs              | 9 +--------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/dom/workers/test/serviceworkers/fetch/fetch_tests.js b/dom/workers/test/serviceworkers/fetch/fetch_tests.js
index c10fd1b87aa..0a12c2941fb 100644
--- a/dom/workers/test/serviceworkers/fetch/fetch_tests.js
+++ b/dom/workers/test/serviceworkers/fetch/fetch_tests.js
@@ -334,7 +334,4 @@ fetch(new Request('empty-header', {headers:{"emptyheader":""}}))
 }).then(function(body) {
   my_ok(body == "emptyheader", "The empty header was observed in the fetch event");
   finish();
-}, function(err) {
-  my_ok(false, "A promise was rejected with " + err);
-  finish();
 });
diff --git a/dom/workers/test/xhr_headers_server.sjs b/dom/workers/test/xhr_headers_server.sjs
index a8ad4824cef..9a12fddfbb1 100644
--- a/dom/workers/test/xhr_headers_server.sjs
+++ b/dom/workers/test/xhr_headers_server.sjs
@@ -11,11 +11,9 @@ function handleRequest(request, response) {
         var optionsHost = request.getHeader("options-host");
       } catch(e) { }
 
-      bool headerFound = false;
       if (optionsHost) {
         setState("postHost", request.host);
         setState("optionsHost", optionsHost);
-        headerFound = true;
       }
 
       try {
@@ -24,13 +22,8 @@ function handleRequest(request, response) {
 
       if (emptyHeader && emptyHeader == "nada") {
         setState("emptyHeader", "nada");
-        headerFound = true;
-      }
-      if (headerFound) {
-        return;
-      } else {
-        break;
       }
+      return;
 
     case "OPTIONS":
       if (getState("optionsHost") == request.host) {