From 7a9b857beea1467f51993aaa29cc9ea0743124dd Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 27 Mar 2018 15:23:10 -0700
Subject: [PATCH] Bug 1449255: Part 10 - Rename test_bug468528 to
 test_blocklist_plugin_regexp.js. r=aswan

MozReview-Commit-ID: HVXg5ljc52z

--HG--
rename : toolkit/mozapps/extensions/test/xpcshell/test_bug468528.js => toolkit/mozapps/extensions/test/xpcshell/test_blocklist_plugin_regexp.js
extra : rebase_source : a4dc3cfab6944e632d2565335907127ed19bdcac
---
 ...bug468528.js => test_blocklist_plugin_regexp.js} | 13 +++++--------
 .../mozapps/extensions/test/xpcshell/xpcshell.ini   |  8 ++++----
 2 files changed, 9 insertions(+), 12 deletions(-)
 rename toolkit/mozapps/extensions/test/xpcshell/{test_bug468528.js => test_blocklist_plugin_regexp.js} (84%)

diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_bug468528.js b/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_plugin_regexp.js
similarity index 84%
rename from toolkit/mozapps/extensions/test/xpcshell/test_bug468528.js
rename to toolkit/mozapps/extensions/test/xpcshell/test_blocklist_plugin_regexp.js
index a09ee65eff6c..10a198de16d5 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_bug468528.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_blocklist_plugin_regexp.js
@@ -2,8 +2,6 @@
  * 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/. */
 
-const nsIBLS = Ci.nsIBlocklistService;
-
 var PLUGINS = [{
   // Normal blacklisted plugin, before an invalid regexp
   name: "test_bug468528_1",
@@ -40,19 +38,18 @@ function run_test() {
   // We cannot force the blocklist to update so just copy our test list to the profile
   copyBlocklistToProfile(do_get_file("data/test_bug468528.xml"));
 
-  var blocklist = Cc["@mozilla.org/extensions/blocklist;1"]
-                    .getService(nsIBLS);
+  var {blocklist} = Services;
 
   // blocked (sanity check)
-  Assert.ok(blocklist.getPluginBlocklistState(PLUGINS[0], "1", "1.9") == nsIBLS.STATE_BLOCKED);
+  Assert.ok(blocklist.getPluginBlocklistState(PLUGINS[0], "1", "1.9") == blocklist.STATE_BLOCKED);
 
   // not blocked - won't match due to invalid regexp
-  Assert.ok(blocklist.getPluginBlocklistState(PLUGINS[1], "1", "1.9") == nsIBLS.STATE_NOT_BLOCKED);
+  Assert.ok(blocklist.getPluginBlocklistState(PLUGINS[1], "1", "1.9") == blocklist.STATE_NOT_BLOCKED);
 
   // blocked - the invalid regexp for the previous item shouldn't affect this one
-  Assert.ok(blocklist.getPluginBlocklistState(PLUGINS[2], "1", "1.9") == nsIBLS.STATE_BLOCKED);
+  Assert.ok(blocklist.getPluginBlocklistState(PLUGINS[2], "1", "1.9") == blocklist.STATE_BLOCKED);
 
   // not blocked - the previous invalid regexp shouldn't act as a wildcard
-  Assert.ok(blocklist.getPluginBlocklistState(PLUGINS[3], "1", "1.9") == nsIBLS.STATE_NOT_BLOCKED);
+  Assert.ok(blocklist.getPluginBlocklistState(PLUGINS[3], "1", "1.9") == blocklist.STATE_NOT_BLOCKED);
 
 }
diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
index 7012e14c8f53..a6ec86f43e2f 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -36,6 +36,10 @@ tags = blocklist
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
 tags = blocklist
+[test_blocklist_plugin_regexp.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
+tags = blocklist
 [test_blocklist_prefs.js]
 tags = blocklist
 [test_blocklist_regexp.js]
@@ -59,10 +63,6 @@ skip-if = true # Bug 1358846 Bug 1365021 Bug 676992
 [test_bootstrap_globals.js]
 [test_bug1180901_2.js]
 skip-if = os != "win"
-[test_bug468528.js]
-# Bug 676992: test consistently hangs on Android
-skip-if = os == "android"
-tags = blocklist
 [test_bug514327_1.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"