wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset a7c3d752bd6a (bug 1184705) for browser_urlbar_search_healthreport.js failures.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2015-07-20 14:24:25 -04:00
parent 0852533047
commit a894c66def
6 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
services/healthreport/docs/dataformat.rst
View File

@ -1603,15 +1603,6 @@ default
In other words, search engines without an ``.identifier``
are prefixed with ``other-``.
Version 2
^^^^^^^^^
Starting with Firefox 40, there is an additional optional value:
cohort
Daily cohort string identifier, recorded if the user is part of
search defaults A/B testing.
org.mozilla.sync.sync
---------------------

7
services/healthreport/providers.jsm
View File

@ -60,7 +60,6 @@ const DAILY_LAST_TEXT_FIELD = {type: Metrics.Storage.FIELD_DAILY_LAST_TEXT};
const DAILY_COUNTER_FIELD = {type: Metrics.Storage.FIELD_DAILY_COUNTER};
const TELEMETRY_PREF = "toolkit.telemetry.enabled";
const SEARCH_COHORT_PREF = "browser.search.cohort";
function isTelemetryEnabled(prefs) {
return prefs.get(TELEMETRY_PREF, false);
@ -1631,11 +1630,10 @@ SearchEnginesMeasurement1.prototype = Object.freeze({
__proto__: Metrics.Measurement.prototype,
name: "engines",
version: 2,
version: 1,
fields: {
default: DAILY_LAST_TEXT_FIELD,
cohort: DAILY_LAST_TEXT_FIELD,
},
});
@ -1690,9 +1688,6 @@ this.SearchesProvider.prototype = Object.freeze({
}
yield m.setDailyLastText("default", name);
if (Services.prefs.prefHasUserValue(SEARCH_COHORT_PREF))
yield m.setDailyLastText("cohort", Services.prefs.getCharPref(SEARCH_COHORT_PREF));
}.bind(this));
},

11
services/healthreport/tests/xpcshell/test_provider_searches.js
View File

@ -146,7 +146,7 @@ add_task(function* test_default_search_engine() {
let provider = new SearchesProvider();
yield provider.init(storage);
let m = provider.getMeasurement("engines", 2);
let m = provider.getMeasurement("engines", 1);
let now = new Date();
yield provider.collectDailyData();
@ -174,14 +174,5 @@ add_task(function* test_default_search_engine() {
data = yield m.getValues();
Assert.equal(data.days.getDay(now).get("default"), "other-testdefault");
// If no cohort identifier is set, we shouldn't report a cohort.
Assert.equal(data.days.getDay(now).get("cohort"), undefined);
// Set a cohort identifier and verify we record it.
Services.prefs.setCharPref("browser.search.cohort", "testcohort");
yield provider.collectDailyData();
data = yield m.getValues();
Assert.equal(data.days.getDay(now).get("cohort"), "testcohort");
yield storage.close();
});

5
toolkit/components/telemetry/TelemetryEnvironment.jsm
View File

@ -153,7 +153,6 @@ const PREF_PARTNER_ID = "mozilla.partner.id";
const PREF_TELEMETRY_ENABLED = "toolkit.telemetry.enabled";
const PREF_UPDATE_ENABLED = "app.update.enabled";
const PREF_UPDATE_AUTODOWNLOAD = "app.update.auto";
const PREF_SEARCH_COHORT = "browser.search.cohort";
const EXPERIMENTS_CHANGED_TOPIC = "experiments-changed";
const SEARCH_ENGINE_MODIFIED_TOPIC = "browser-search-engine-modified";
@ -883,10 +882,6 @@ EnvironmentCache.prototype = {
this._currentEnvironment.settings.defaultSearchEngine = this._getDefaultSearchEngine();
this._currentEnvironment.settings.defaultSearchEngineData =
Services.search.getDefaultEngineInfo();
// Record the cohort identifier used for search defaults A/B testing.
if (Services.prefs.prefHasUserValue(PREF_SEARCH_COHORT))
this._currentEnvironment.settings.searchCohort = Services.prefs.getCharPref(PREF_SEARCH_COHORT);
},
/**

5
toolkit/components/telemetry/docs/environment.rst
View File

@ -244,8 +244,3 @@ The object contains:
For privacy, we don't record this for user-installed engines.
``loadPath`` and ``submissionURL`` are not present if ``name`` is ``NONE``.
searchCohort
~~~~~~~~~~~~
If the user has been enrolled into a search default change experiment, this contains the string identifying the experiment the user is taking part in. Most user profiles will never be part of any search default change experiment, and will not send this value.

9
toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
View File

@ -1097,15 +1097,6 @@ add_task(function* test_defaultSearchEngine() {
data = TelemetryEnvironment.currentEnvironment;
checkEnvironmentData(data);
Assert.equal(data.settings.defaultSearchEngine, EXPECTED_SEARCH_ENGINE);
// Check that by default we are not sending a cohort identifier...
Assert.equal(data.settings.searchCohort, undefined);
// ... but that if a cohort identifier is set, we send it.
Services.prefs.setCharPref("browser.search.cohort", "testcohort");
Services.obs.notifyObservers(null, "browser-search-service", "init-complete");
data = TelemetryEnvironment.currentEnvironment;
Assert.equal(data.settings.searchCohort, "testcohort");
});
add_task(function*() {