Bug 1085246 - Make browser_fxa_login.js ignore the load for the placeholder tab in openFxASettings. r=gavin, r=Mossop, a=me

--HG--
extra : amend_source : abbb3dcb181d3cd2aa34ef5c8edbd90997c8330b
extra : transplant_source : y%CFj%AA%B4%C3%E06%BC%EA%90jEK%E0%BFRX%25_

browser/components/loop/test/mochitest/browser_fxa_login.js

@@ -421,6 +421,10 @@ add_task(function* openFxASettings() {
   yield new Promise((resolve, reject) => {
     let progressListener = {
       onLocationChange: function onLocationChange(aBrowser) {
+        if (aBrowser.currentURI.spec == BASE_URL) {
+          // Ignore the changes from the addTab above.
+          return;
+        }
         gBrowser.removeTabsProgressListener(progressListener);
         let contentURI = Services.io.newURI(params.content_uri, null, null);
         is(aBrowser.currentURI.spec, Services.io.newURI("/settings", null, contentURI).spec,