Merge branch 'redwood' into 28.9-platform

1 files changed, 0 insertions, 54 deletions

diff --git a/toolkit/components/captivedetect/test/unit/test_user_cancel.js b/toolkit/components/captivedetect/test/unit/test_user_cancel.js
deleted file mode 100644
index a03876817..000000000
--- a/toolkit/components/captivedetect/test/unit/test_user_cancel.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-'use strict';
-
-const kInterfaceName = 'wifi';
-
-var server;
-var step = 0;
-
-function xhr_handler(metadata, response) {
-  response.setStatusLine(metadata.httpVersion, 200, 'OK');
-  response.setHeader('Cache-Control', 'no-cache', false);
-  response.setHeader('Content-Type', 'text/plain', false);
-  response.write('false');
-}
-
-function fakeUIResponse() {
-  Services.obs.addObserver(function observe(subject, topic, data) {
-    if (topic === 'captive-portal-login') {
-      let xhr = Cc['@mozilla.org/xmlextras/xmlhttprequest;1']
-                  .createInstance(Ci.nsIXMLHttpRequest);
-      xhr.open('GET', gServerURL + kCanonicalSitePath, true);
-      xhr.send();
-      do_check_eq(++step, 2);
-      let details = JSON.parse(data);
-      gCaptivePortalDetector.cancelLogin(details.id);
-    }
-  }, 'captive-portal-login', false);
-}
-
-function test_cancel() {
-  do_test_pending();
-
-  let callback = {
-    QueryInterface: XPCOMUtils.generateQI([Ci.nsICaptivePortalCallback]),
-    prepare: function prepare() {
-      do_check_eq(++step, 1);
-      gCaptivePortalDetector.finishPreparation(kInterfaceName);
-    },
-    complete: function complete(success) {
-      do_check_eq(++step, 3);
-      do_check_false(success);
-      gServer.stop(do_test_finished);
-    },
-  };
-
-  gCaptivePortalDetector.checkCaptivePortal(kInterfaceName, callback);
-}
-
-function run_test() {
-  run_captivedetect_test(xhr_handler, fakeUIResponse, test_cancel);
-}