Backed out changeset eba1f5d0a908 (bug 864395) for Gaia integration test failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 29 Apr 2014 21:41:03 -0400
changeset 180902 c023a60a68a8107e1808322c2bf24fbd557af3cf
parent 180901 08a8d518bab1c1488dcb3d4e5918428c8fa6fda8
child 180903 e19812f5695283848e15b9b98fc06f4f97a7d79b
child 180957 0e2d11857b84694ea0b38d772e7ddb44df40430b
push id6575
push userryanvm@gmail.com
push dateWed, 30 Apr 2014 04:06:54 +0000
treeherderfx-team@e19812f56952 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs864395
milestone32.0a1
backs outeba1f5d0a90839eb400970690562e8110149dcfb
Backed out changeset eba1f5d0a908 (bug 864395) for Gaia integration test failures. CLOSED TREE
b2g/chrome/content/settings.js
--- a/b2g/chrome/content/settings.js
+++ b/b2g/chrome/content/settings.js
@@ -627,43 +627,16 @@ SettingsListener.observe('apz.displaypor
     Services.prefs.setCharPref('apz.y_skate_size_multiplier', '1.5');
     break;
   case 'no-checkerboard':
     Services.prefs.setBoolPref('apz.allow-checkerboarding', false);
     break;
   }
 });
 
-// =================== Telemetry  ======================
-(function setupTelemetrySettings() {
-  let gaiaSettingName = 'debug.performance_data.shared';
-  let geckoPrefName = 'toolkit.telemetry.enabled';
-  SettingsListener.observe(gaiaSettingName, null, function(value) {
-    if (value !== null) {
-      // Gaia setting has been set; update Gecko pref to that.
-      Services.prefs.setBoolPref(geckoPrefName, value);
-      return;
-    }
-    // Gaia setting has not been set; set the gaia setting to default.
-#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
-    let prefValue = true;
-#else
-    let prefValue = false;
-#endif
-    try {
-      prefValue = Services.prefs.getBoolPref(geckoPrefName);
-    } catch (e) {
-      // Pref not set; use default value.
-    }
-    let setting = {};
-    setting[gaiaSettingName] = prefValue;
-    window.navigator.mozSettings.createLock().set(setting);
-  });
-})();
-
 // =================== Various simple mapping  ======================
 let settingsToObserve = {
   'ril.mms.retrieval_mode': {
     prefName: 'dom.mms.retrieval_mode',
     defaultValue: 'manual'
   },
   'ril.sms.strict7BitEncoding.enabled': {
     prefName: 'dom.sms.strict7BitEncoding',