Bug 951883 - Part 2: Remove temporary compile time guards. r=me

--HG--
extra : rebase_source : 51325eeea8fc1d5b2e7cd84e8977072b030496c8

mobile/android/chrome/jar.mn

@@ -55,12 +55,8 @@ chrome.jar:
   content/aboutHealthReport.xhtml      (content/aboutHealthReport.xhtml)
 * content/aboutHealthReport.js         (content/aboutHealthReport.js)
 #endif
-#ifndef NO_FIREFOX_ACCOUNTS
-# This is reversed for easy application and testing.  We should create
-# a new top-level define and set it in mobile/android/confvars.sh.
   content/aboutAccounts.xhtml          (content/aboutAccounts.xhtml)
 * content/aboutAccounts.js             (content/aboutAccounts.js)
-#endif
 
 % content branding %content/branding/
 

mobile/android/components/AboutRedirector.js

@@ -78,14 +78,10 @@ let modules = {
     privileged: true
   },
 #endif
-#ifndef NO_FIREFOX_ACCOUNTS
-# This is reversed for easy application and testing.  We should create
-# a new top-level define and set it in mobile/android/confvars.sh.
   accounts: {
     uri: "chrome://browser/content/aboutAccounts.xhtml",
     privileged: true
   },
-#endif
 }
 
 function AboutRedirector() {}

mobile/android/components/MobileComponents.manifest

@@ -12,11 +12,7 @@ contract @mozilla.org/network/protocol/about;1?what=downloads {322ba47e-7047-4f7
 contract @mozilla.org/network/protocol/about;1?what=reader {322ba47e-7047-4f71-aebf-cb7d69325cd9}
 contract @mozilla.org/network/protocol/about;1?what=feedback {322ba47e-7047-4f71-aebf-cb7d69325cd9}
 contract @mozilla.org/network/protocol/about;1?what=privatebrowsing {322ba47e-7047-4f71-aebf-cb7d69325cd9}
-#ifndef NO_FIREFOX_ACCOUNTS
-# This is reversed for easy application and testing.  We should create
-# a new top-level define and set it in mobile/android/confvars.sh.
 contract @mozilla.org/network/protocol/about;1?what=accounts {322ba47e-7047-4f71-aebf-cb7d69325cd9}
-#endif
 #ifdef MOZ_SERVICES_HEALTHREPORT
 contract @mozilla.org/network/protocol/about;1?what=healthreport {322ba47e-7047-4f71-aebf-cb7d69325cd9}
 #endif

mobile/android/locales/jar.mn

@@ -7,11 +7,7 @@
 @AB_CD@.jar:
 % locale browser @AB_CD@ %locale/@AB_CD@/browser/
   locale/@AB_CD@/browser/about.dtd                (%chrome/about.dtd)
-#ifndef NO_FIREFOX_ACCOUNTS
-# This is reversed for easy application and testing.  We should create
-# a new top-level define and set it in mobile/android/confvars.sh.
   locale/@AB_CD@/browser/aboutAccounts.dtd        (%chrome/aboutAccounts.dtd)
-#endif
   locale/@AB_CD@/browser/aboutAddons.dtd          (%chrome/aboutAddons.dtd)
   locale/@AB_CD@/browser/aboutAddons.properties   (%chrome/aboutAddons.properties)
   locale/@AB_CD@/browser/aboutApps.dtd            (%chrome/aboutApps.dtd)

mobile/android/themes/core/jar.mn

@@ -8,11 +8,7 @@ chrome.jar:
 % skin browser classic/1.0 %skin/
   skin/aboutPage.css                        (aboutPage.css)
   skin/about.css                            (about.css)
-#ifndef NO_FIREFOX_ACCOUNTS
-# This is reversed for easy application and testing.  We should create
-# a new top-level define and set it in mobile/android/confvars.sh.
   skin/aboutAccounts.css                    (aboutAccounts.css)
-#endif
   skin/aboutAddons.css                      (aboutAddons.css)
   skin/aboutApps.css                        (aboutApps.css)
   skin/aboutBase.css                        (aboutBase.css)