Merge mozilla-central to mozilla-inbound to fix eslint issue

This commit is contained in:
Carsten "Tomcat" Book 2017-03-07 17:38:47 +01:00
Родитель 8c57507111 d4adaabd6d
Коммит 8009b25954
1 изменённых файлов: 16 добавлений и 16 удалений

Просмотреть файл

@ -100,9 +100,9 @@ add_task(function* test_simpleQuery() {
// Let's reset the counts.
Services.telemetry.clearScalars();
Services.telemetry.clearEvents();
//let resultIndexHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX");
// let resultIndexHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX");
let resultTypeHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_TYPE");
//resultIndexHist.clear();
// resultIndexHist.clear();
resultTypeHist.clear();
let search_hist = getSearchCountsHistogram();
@ -130,8 +130,8 @@ add_task(function* test_simpleQuery() {
checkEvents(events, [["navigation", "search", "urlbar", "enter", {engine: "other-MozSearch"}]]);
// Check the histograms as well.
//let resultIndexes = resultIndexHist.snapshot();
//checkHistogramResults(resultIndexes, 0, "FX_URLBAR_SELECTED_RESULT_INDEX");
// let resultIndexes = resultIndexHist.snapshot();
// checkHistogramResults(resultIndexes, 0, "FX_URLBAR_SELECTED_RESULT_INDEX");
let resultTypes = resultTypeHist.snapshot();
checkHistogramResults(resultTypes,
@ -145,9 +145,9 @@ add_task(function* test_searchAlias() {
// Let's reset the counts.
Services.telemetry.clearScalars();
Services.telemetry.clearEvents();
//let resultIndexHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX");
// let resultIndexHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX");
let resultTypeHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_TYPE");
//resultIndexHist.clear();
// resultIndexHist.clear();
resultTypeHist.clear();
let search_hist = getSearchCountsHistogram();
@ -175,8 +175,8 @@ add_task(function* test_searchAlias() {
checkEvents(events, [["navigation", "search", "urlbar", "alias", {engine: "other-MozSearch"}]]);
// Check the histograms as well.
//let resultIndexes = resultIndexHist.snapshot();
//checkHistogramResults(resultIndexes, 0, "FX_URLBAR_SELECTED_RESULT_INDEX");
// let resultIndexes = resultIndexHist.snapshot();
// checkHistogramResults(resultIndexes, 0, "FX_URLBAR_SELECTED_RESULT_INDEX");
let resultTypes = resultTypeHist.snapshot();
checkHistogramResults(resultTypes,
@ -190,9 +190,9 @@ add_task(function* test_oneOff() {
// Let's reset the counts.
Services.telemetry.clearScalars();
Services.telemetry.clearEvents();
//let resultIndexHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX");
// let resultIndexHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX");
let resultTypeHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_TYPE");
//resultIndexHist.clear();
// resultIndexHist.clear();
resultTypeHist.clear();
let search_hist = getSearchCountsHistogram();
@ -223,8 +223,8 @@ add_task(function* test_oneOff() {
checkEvents(events, [["navigation", "search", "urlbar", "oneoff", {engine: "other-MozSearch"}]]);
// Check the histograms as well.
//let resultIndexes = resultIndexHist.snapshot();
//checkHistogramResults(resultIndexes, 0, "FX_URLBAR_SELECTED_RESULT_INDEX");
// let resultIndexes = resultIndexHist.snapshot();
// checkHistogramResults(resultIndexes, 0, "FX_URLBAR_SELECTED_RESULT_INDEX");
let resultTypes = resultTypeHist.snapshot();
checkHistogramResults(resultTypes,
@ -238,9 +238,9 @@ add_task(function* test_suggestion() {
// Let's reset the counts.
Services.telemetry.clearScalars();
Services.telemetry.clearEvents();
//let resultIndexHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX");
// let resultIndexHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_INDEX");
let resultTypeHist = Services.telemetry.getHistogramById("FX_URLBAR_SELECTED_RESULT_TYPE");
//resultIndexHist.clear();
// resultIndexHist.clear();
resultTypeHist.clear();
let search_hist = getSearchCountsHistogram();
@ -283,8 +283,8 @@ add_task(function* test_suggestion() {
checkEvents(events, [["navigation", "search", "urlbar", "suggestion", {engine: searchEngineId}]]);
// Check the histograms as well.
//let resultIndexes = resultIndexHist.snapshot();
//checkHistogramResults(resultIndexes, 3, "FX_URLBAR_SELECTED_RESULT_INDEX");
// let resultIndexes = resultIndexHist.snapshot();
// checkHistogramResults(resultIndexes, 3, "FX_URLBAR_SELECTED_RESULT_INDEX");
let resultTypes = resultTypeHist.snapshot();
checkHistogramResults(resultTypes,