From 397e35b6c1405d3654337e1ab55e4c38fe6a8e07 Mon Sep 17 00:00:00 2001
From: Mathieu Leplatre <mathieu@mozilla.com>
Date: Thu, 21 Apr 2016 17:22:01 +0200
Subject: [PATCH] Bug 1266235 - Rename kinto-updater to blocklist-updater.
 r=mgoodwin

MozReview-Commit-ID: 8bDKbxbIus3

--HG--
rename : services/common/kinto-updater.js => services/common/blocklist-updater.js
rename : services/common/tests/unit/test_kinto_updater.js => services/common/tests/unit/test_blocklist_updater.js
extra : rebase_source : 4d03542a741cdd38bc048f54fea6a752e8114f40
---
 services/common/{kinto-updater.js => blocklist-updater.js}   | 0
 services/common/moz.build                                    | 2 +-
 .../{test_kinto_updater.js => test_blocklist_updater.js}     | 3 +--
 services/common/tests/unit/xpcshell.ini                      | 5 +++--
 toolkit/mozapps/extensions/nsBlocklistService.js             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename services/common/{kinto-updater.js => blocklist-updater.js} (100%)
 rename services/common/tests/unit/{test_kinto_updater.js => test_blocklist_updater.js} (97%)

diff --git a/services/common/kinto-updater.js b/services/common/blocklist-updater.js
similarity index 100%
rename from services/common/kinto-updater.js
rename to services/common/blocklist-updater.js
diff --git a/services/common/moz.build b/services/common/moz.build
index 5056395a863a..afadfb6d3eee 100644
--- a/services/common/moz.build
+++ b/services/common/moz.build
@@ -15,9 +15,9 @@ EXTRA_COMPONENTS += [
 
 EXTRA_JS_MODULES['services-common'] += [
     'async.js',
+    'blocklist-updater.js',
     'kinto-http-client.js',
     'kinto-offline-client.js',
-    'kinto-updater.js',
     'KintoBlocklist.js',
     'logmanager.js',
     'observers.js',
diff --git a/services/common/tests/unit/test_kinto_updater.js b/services/common/tests/unit/test_blocklist_updater.js
similarity index 97%
rename from services/common/tests/unit/test_kinto_updater.js
rename to services/common/tests/unit/test_blocklist_updater.js
index a44f45b2a787..f88f2b0c152c 100644
--- a/services/common/tests/unit/test_kinto_updater.js
+++ b/services/common/tests/unit/test_blocklist_updater.js
@@ -1,4 +1,3 @@
-Cu.import("resource://services-common/kinto-updater.js")
 Cu.import("resource://testing-common/httpd.js");
 
 var server;
@@ -52,7 +51,7 @@ add_task(function* test_check_maybeSync(){
 
   let startTime = Date.now();
 
-  let updater = Cu.import("resource://services-common/kinto-updater.js");
+  let updater = Cu.import("resource://services-common/blocklist-updater.js");
 
   let syncPromise = new Promise(function(resolve, reject) {
     // add a test kinto client that will respond to lastModified information
diff --git a/services/common/tests/unit/xpcshell.ini b/services/common/tests/unit/xpcshell.ini
index fb1708cd447f..f81fe1f408ab 100644
--- a/services/common/tests/unit/xpcshell.ini
+++ b/services/common/tests/unit/xpcshell.ini
@@ -9,10 +9,11 @@ support-files =
 # Test load modules first so syntax failures are caught early.
 [test_load_modules.js]
 
-[test_kinto.js]
-[test_kinto_updater.js]
+[test_blocklist_updater.js]
 [test_kintoAddonPluginBlocklist.js]
 [test_kintoCertBlocklist.js]
+
+[test_kinto.js]
 [test_storage_adapter.js]
 
 [test_utils_atob.js]
diff --git a/toolkit/mozapps/extensions/nsBlocklistService.js b/toolkit/mozapps/extensions/nsBlocklistService.js
index d25d9e334206..09819b7362e9 100644
--- a/toolkit/mozapps/extensions/nsBlocklistService.js
+++ b/toolkit/mozapps/extensions/nsBlocklistService.js
@@ -633,7 +633,7 @@ Blocklist.prototype = {
     // If kinto update is enabled, do the kinto update
     if (gPref.getBoolPref(PREF_KINTO_UPDATE_ENABLED)) {
       let KintoUpdater =
-        Components.utils.import("resource://services-common/kinto-updater.js",
+        Components.utils.import("resource://services-common/blocklist-updater.js",
                                 {});
       KintoUpdater.checkVersions().catch(() => {
         // Before we enable this in release, we want to collect telemetry on