From c6cf08cedd170a2f5255c5acb86f959e830ae53e Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 14 Jun 2017 10:18:27 +0100
Subject: [PATCH] Bug 1372309 - fix browser_sync.js and
 browser_UITour_availableTargets.js to work with photon structure enabled,
 r=mikedeboer

MozReview-Commit-ID: 4bsqWScnRo2

--HG--
extra : rebase_source : a1b0f0dbd35054903469ae1623f56be9d038ad83
---
 browser/base/content/test/sync/browser_sync.js               | 5 +++--
 .../uitour/test/browser_UITour_availableTargets.js           | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/test/sync/browser_sync.js b/browser/base/content/test/sync/browser_sync.js
index c4d0d7efd18f..a77d3503bf77 100644
--- a/browser/base/content/test/sync/browser_sync.js
+++ b/browser/base/content/test/sync/browser_sync.js
@@ -52,7 +52,8 @@ add_task(async function test_ui_state_syncing() {
 
   gSync.updateAllUI(state);
 
-  checkSyncNowButton("PanelUI-fxa-icon", true);
+  let prefix = gPhotonStructure ? "appMenu" : "PanelUI";
+  checkSyncNowButton(`${prefix}-fxa-icon`, true);
   checkSyncNowButton("PanelUI-remotetabs-syncnow", true);
 
   // Be good citizens and remove the "syncing" state.
@@ -193,7 +194,7 @@ function checkSyncNowButton(buttonId, syncing, tooltip = null) {
     is(remoteTabsButton.getAttribute("tooltiptext"), tooltip, "button tooltiptext is set to the right value");
   }
 
-  if (buttonId == "PanelUI-fxa-icon") {
+  if (buttonId.endsWith("-fxa-icon")) {
     return;
   }
 
diff --git a/browser/components/uitour/test/browser_UITour_availableTargets.js b/browser/components/uitour/test/browser_UITour_availableTargets.js
index 94c9afd3c8d9..21fe89c42fb0 100644
--- a/browser/components/uitour/test/browser_UITour_availableTargets.js
+++ b/browser/components/uitour/test/browser_UITour_availableTargets.js
@@ -7,7 +7,7 @@ var gContentWindow;
 var hasPocket = Services.prefs.getBoolPref("extensions.pocket.enabled");
 var isPhoton = Services.prefs.getBoolPref("browser.photon.structure.enabled");
 var hasQuit = !isPhoton ||
-              false; // Update this with AppConstants.platform != "macosx" after bug 1368734 lands;
+              AppConstants.platform != "macosx";
 var hasLibrary = isPhoton || false;
 
 requestLongerTimeout(2);