Use MOZ_PHOENIX instead of checking for 'browser' in MOZ_BUILD_APP

toolkit/components/passwordmgr/moz.build

@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-if CONFIG['MOZ_BUILD_APP'] == 'browser':
+if CONFIG['MOZ_PHOENIX']:
     DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True
 
 MOCHITEST_MANIFESTS += ['test/mochitest.ini', 'test/mochitest/mochitest.ini']
@@ -67,7 +67,7 @@ if CONFIG['OS_TARGET'] == 'WINNT':
         'OSCrypto_win.js',
     ]
 
-if CONFIG['MOZ_BUILD_APP'] == 'browser':
+if CONFIG['MOZ_PHOENIX']:
     EXTRA_JS_MODULES += [
         'LoginManagerContextMenu.jsm',
     ]

toolkit/components/search/moz.build

@@ -11,7 +11,7 @@ EXTRA_COMPONENTS += [
     'nsSearchSuggestions.js',
 ]
 
-if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
+if CONFIG['MOZ_BUILD_APP'] in ['mobile/android', 'xulrunner'] or CONFIG['MOZ_PHOENIX']:
     DEFINES['HAVE_SIDEBAR'] = True
     EXTRA_COMPONENTS += [
     'nsSidebar.js',

toolkit/components/telemetry/TelemetryEnvironment.jsm

@@ -784,7 +784,7 @@ function EnvironmentCache() {
 
   this._currentEnvironment.profile = {};
   p.push(this._updateProfile());
-  if (AppConstants.MOZ_BUILD_APP == "browser") {
+  if (AppConstants.MOZ_PHOENIX) {
     p.push(this._updateAttribution());
   }