Merge branch 'redwood' into 28.9-platform

1 files changed, 0 insertions, 34 deletions

diff --git a/toolkit/components/contentprefs/tests/unit/test_getPrefAsync.js b/toolkit/components/contentprefs/tests/unit/test_getPrefAsync.js
deleted file mode 100644
index 27d239f79..000000000
--- a/toolkit/components/contentprefs/tests/unit/test_getPrefAsync.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/* 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/. */
-var cps = new ContentPrefInstance(null);
-var uri = ContentPrefTest.getURI("http://www.example.com/");
-
-function run_test() {
-  do_test_pending();
-
-  cps.setPref(uri, "asynctest", "pie");
-  do_check_eq(cps.getPref(uri, "asynctest"), "pie");
-
-  cps.getPref(uri, "asynctest", function(aValue) {
-    do_check_eq(aValue, "pie");
-    testCallbackObj();
-  });
-}
-
-function testCallbackObj() {
-  cps.getPref(uri, "asynctest", {
-    onResult: function(aValue) {
-      do_check_eq(aValue, "pie");
-      cps.removePref(uri, "asynctest");
-      testNoResult();
-    }
-  });
-}
-
-function testNoResult() {
-  cps.getPref(uri, "asynctest", function(aValue) {
-    do_check_eq(aValue, undefined);
-    do_test_finished();
-  });
-}