Bug 1168544 - fix social orange by avoiding reaching into the content document. r=mixedpuppy
authorMark Hammond <mhammond@skippinet.com.au>
Wed, 09 Sep 2015 10:18:59 +1000
changeset 281308 8ef6aa7ee1fe93d8d091603be5cb869af4d48773
parent 281307 4148547a8d54935462d985eff6b4f544a13e884e
child 281309 e058b19dcdfe4feedf1019b03c6e26d0d4a5bdcd
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-esr52@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmixedpuppy
bugs1168544
milestone43.0a1
Bug 1168544 - fix social orange by avoiding reaching into the content document. r=mixedpuppy
browser/base/content/test/social/browser_social_activation.js
--- a/browser/base/content/test/social/browser_social_activation.js
+++ b/browser/base/content/test/social/browser_social_activation.js
@@ -79,18 +79,18 @@ function activateIFrameProvider(domain, 
     sendActivationEvent(tab, callback, false);
   });
 }
 
 function waitForProviderLoad(cb) {
     waitForCondition(function() {
       let sbrowser = document.getElementById("social-sidebar-browser");
       let provider = SocialSidebar.provider;
-      let postActivation = provider && gBrowser.contentDocument &&
-                            gBrowser.contentDocument.location.href == provider.origin + "/browser/browser/base/content/test/social/social_postActivation.html";
+      let postActivation = provider && gBrowser.currentURI &&
+                            gBrowser.currentURI.spec == provider.origin + "/browser/browser/base/content/test/social/social_postActivation.html";
 
       return postActivation && sbrowser.docShellIsActive;
     }, function() {
       // executeSoon to let the browser UI observers run first
       executeSoon(cb);
     },
     "waitForProviderLoad: provider was not loaded");
 }