Backed out changeset ecc5cb4dcdfe (bug 1066816) for loop test failures
authorEd Morley <emorley@mozilla.com>
Tue, 16 Sep 2014 16:01:15 +0100
changeset 228677 6f609219f77a60d6c31c1cfecd747bd98562ba9a
parent 228676 baa2460daf87b462da11adbc4b89a1eafdef7aa6
child 228678 93a2036a377e1019f92c802aba84fbc32809db67
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1066816
milestone35.0a1
backs outecc5cb4dcdfe9862b2078ba7c1674c4e8337f4d4
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
Backed out changeset ecc5cb4dcdfe (bug 1066816) for loop test failures
browser/components/loop/content/js/conversation.js
browser/components/loop/content/js/conversation.jsx
--- a/browser/components/loop/content/js/conversation.js
+++ b/browser/components/loop/content/js/conversation.js
@@ -405,28 +405,16 @@ loop.conversation = (function(OT, mozL10
   /**
    * Panel initialisation.
    */
   function init() {
     // Do the initial L10n setup, we do this before anything
     // else to ensure the L10n environment is setup correctly.
     mozL10n.initialize(navigator.mozLoop);
 
-    // Plug in an alternate client ID mechanism, as localStorage and cookies
-    // don't work in the conversation window
-    OT.overrideGuidStorage({
-      get: function(callback) {
-        callback(null, navigator.mozLoop.getLoopCharPref("ot.guid"));
-      },
-      set: function(guid, callback) {
-        navigator.mozLoop.setLoopCharPref("ot.guid", guid);
-        callback(null);
-      }
-    });
-
     document.title = mozL10n.get("incoming_call_title2");
 
     document.body.classList.add(loop.shared.utils.getTargetPlatform());
 
     var client = new loop.Client();
     router = new ConversationRouter({
       client: client,
       conversation: new loop.shared.models.ConversationModel(
--- a/browser/components/loop/content/js/conversation.jsx
+++ b/browser/components/loop/content/js/conversation.jsx
@@ -405,28 +405,16 @@ loop.conversation = (function(OT, mozL10
   /**
    * Panel initialisation.
    */
   function init() {
     // Do the initial L10n setup, we do this before anything
     // else to ensure the L10n environment is setup correctly.
     mozL10n.initialize(navigator.mozLoop);
 
-    // Plug in an alternate client ID mechanism, as localStorage and cookies
-    // don't work in the conversation window
-    OT.overrideGuidStorage({
-      get: function(callback) {
-        callback(null, navigator.mozLoop.getLoopCharPref("ot.guid"));
-      },
-      set: function(guid, callback) {
-        navigator.mozLoop.setLoopCharPref("ot.guid", guid);
-        callback(null);
-      }
-    });
-
     document.title = mozL10n.get("incoming_call_title2");
 
     document.body.classList.add(loop.shared.utils.getTargetPlatform());
 
     var client = new loop.Client();
     router = new ConversationRouter({
       client: client,
       conversation: new loop.shared.models.ConversationModel(