Bug 1545391 - Move ClientID.jsm into Telemetry component r=chutten
authorJan-Erik Rediger <jrediger@mozilla.com>
Mon, 29 Apr 2019 15:39:35 +0000
changeset 530632 02577b646f622d8ac7e33b5b2cd315c8b28fdb1c
parent 530631 d93d203fad60226f727931e2ba295e5299c0c86c
child 530633 3a10833865f1ba444cd6be44b0ef3f951cfd90e1
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschutten
bugs1545391
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1545391 - Move ClientID.jsm into Telemetry component r=chutten Differential Revision: https://phabricator.services.mozilla.com/D29206
toolkit/components/telemetry/app/ClientID.jsm
toolkit/components/telemetry/moz.build
toolkit/components/telemetry/tests/unit/test_client_id.js
toolkit/components/telemetry/tests/unit/xpcshell.ini
toolkit/modules/ClientID.jsm
toolkit/modules/moz.build
toolkit/modules/tests/xpcshell/test_client_id.js
toolkit/modules/tests/xpcshell/xpcshell.ini
rename from toolkit/modules/ClientID.jsm
rename to toolkit/components/telemetry/app/ClientID.jsm
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -96,16 +96,17 @@ if CONFIG['MOZ_GECKO_PROFILER']:
     ]
 
 XPCOM_MANIFESTS += [
     'components.conf',
     'core/components.conf',
 ]
 
 EXTRA_JS_MODULES += [
+    'app/ClientID.jsm',
     'app/TelemetryArchive.jsm',
     'app/TelemetryController.jsm',
     'app/TelemetryEnvironment.jsm',
     'app/TelemetryReportingPolicy.jsm',
     'app/TelemetryScheduler.jsm',
     'app/TelemetrySend.jsm',
     'app/TelemetryStorage.jsm',
     'app/TelemetryTimestamps.jsm',
rename from toolkit/modules/tests/xpcshell/test_client_id.js
rename to toolkit/components/telemetry/tests/unit/test_client_id.js
--- a/toolkit/modules/tests/xpcshell/test_client_id.js
+++ b/toolkit/components/telemetry/tests/unit/test_client_id.js
@@ -1,17 +1,16 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const {ClientID} = ChromeUtils.import("resource://gre/modules/ClientID.jsm");
 const {CommonUtils} = ChromeUtils.import("resource://services-common/utils.js");
 const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
-const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 
 const PREF_CACHED_CLIENTID = "toolkit.telemetry.cachedClientID";
 
 function run_test() {
   do_get_profile();
   run_next_test();
 }
 
--- a/toolkit/components/telemetry/tests/unit/xpcshell.ini
+++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini
@@ -17,16 +17,17 @@ support-files =
   testUnicodePDBAArch64.dll
   testNoPDBAArch64.dll
   !/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
 generated-files =
   dictionary.xpi
   system.xpi
   restartless.xpi
 
+[test_client_id.js]
 [test_GeckoView.js]
 skip-if = os == "android" # Disabled due to crashes (see bug 1331366)
 head = head_GeckoView.js
 support-files =
   test_GeckoView_content_histograms.js
 [test_GeckoView_ScalarSemantics.js]
 skip-if = os == "android" # Disabled due to crashes (see bug 1331366)
 head = head_GeckoView.js
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -43,31 +43,25 @@ with Files('tests/xpcshell/test_Match*.j
     BUG_COMPONENT = ('WebExtensions', 'General')
 
 with Files('tests/xpcshell/test_NewTabUtils.js'):
     BUG_COMPONENT = ('Firefox', 'New Tab Page')
 
 with Files('tests/xpcshell/test_UpdateUtils*.js'):
     BUG_COMPONENT = ('Toolkit', 'Application Update')
 
-with Files('tests/xpcshell/test_client_id.js'):
-    BUG_COMPONENT = ('Toolkit', 'Telemetry')
-
 with Files('AsyncPrefs.jsm'):
     BUG_COMPONENT = ('Core', 'Security: Process Sandboxing')
 
 with Files('AutoScrollController.jsm'):
     BUG_COMPONENT = ('Core', 'Panning and Zooming')
 
 with Files('CharsetMenu.jsm'):
     BUG_COMPONENT = ('Firefox', 'Toolbars and Customization')
 
-with Files('ClientID.jsm'):
-    BUG_COMPONENT = ('Toolkit', 'Telemetry')
-
 with Files('Color.jsm'):
     BUG_COMPONENT = ('Toolkit', 'Find Toolbar')
 
 with Files('Console.jsm'):
     BUG_COMPONENT = ('DevTools', 'Console')
 
 with Files('DateTimePicker*.jsm'):
     BUG_COMPONENT = ('Core', 'Layout: Form Controls ')
@@ -186,17 +180,16 @@ EXTRA_JS_MODULES += [
     'AsyncPrefs.jsm',
     'AutoCompletePopupContent.jsm',
     'AutoScrollController.jsm',
     'BinarySearch.jsm',
     'BrowserUtils.jsm',
     'CanonicalJSON.jsm',
     'CertUtils.jsm',
     'CharsetMenu.jsm',
-    'ClientID.jsm',
     'Color.jsm',
     'Console.jsm',
     'CreditCard.jsm',
     'css-selector.js',
     'DateTimePickerPanel.jsm',
     'DateTimePickerParent.jsm',
     'DeferredTask.jsm',
     'Deprecated.jsm',
--- a/toolkit/modules/tests/xpcshell/xpcshell.ini
+++ b/toolkit/modules/tests/xpcshell/xpcshell.ini
@@ -6,17 +6,16 @@ support-files =
   propertyLists/bug710259_propertyListXML.plist
   chromeappsstore.sqlite
   corrupt.sqlite
   zips/zen.zip
 
 [test_BinarySearch.js]
 skip-if = toolkit == 'android'
 [test_CanonicalJSON.js]
-[test_client_id.js]
 [test_Color.js]
 [test_CreditCard.js]
 [test_DeferredTask.js]
 skip-if = toolkit == 'android'
 [test_FileUtils.js]
 skip-if = toolkit == 'android'
 [test_FinderIterator.js]
 [test_GMPInstallManager.js]