Bug 581008 - Remove support for appending arbitrary data to the User Agent string, Fennec part. r=mfinkle

mobile/app/Makefile.in

@@ -108,8 +108,6 @@ DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) \
            -DAPP_BUILDID=$(APP_BUILDID) \
            -DAPP_NAME=$(MOZ_APP_NAME) \
            -DAPP_VERSION=$(MOZ_APP_VERSION) \
-           -DAPP_UA_NAME_EXTRA=$(MOZ_APP_UA_EXTRA) \
-           -DAPP_VERSION_EXTRA=$(FIREFOX_VERSION) \
            -DMOZ_UPDATER=$(MOZ_UPDATER) \
            $(NULL)
 

mobile/app/mobile.js

@@ -37,7 +37,7 @@
 #filter substitution
 
 pref("toolkit.defaultChromeURI", "chrome://browser/content/browser.xul");
-pref("general.useragent.extra.mobile", "@APP_UA_NAME_EXTRA@/@APP_VERSION_EXTRA@ Fennec/@APP_VERSION@");
+pref("general.useragent.compatMode.firefox", true);
 pref("browser.chromeURL", "chrome://browser/content/");
 
 pref("browser.tabs.warnOnClose", true);

mobile/branding/nightly/configure.sh

@@ -1,2 +1 @@
 MOZ_APP_DISPLAYNAME=Fennec
-MOZ_APP_UA_EXTRA=Namoroka

mobile/branding/official/configure.sh

@@ -1,2 +1 @@
 MOZ_APP_DISPLAYNAME=Firefox
-MOZ_APP_UA_EXTRA=Firefox

mobile/confvars.sh

@@ -36,6 +36,7 @@
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=fennec
+MOZ_APP_UA_NAME=Fennec
 MOZ_BRANDING_DIRECTORY=mobile/branding/nightly
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/branding/official