Main part of bug 570902 - Remove ifdefs relating to MOZILLA_1_9_2 from Thunderbird. r+sr=Standard8

2010-06-10 11:11:38 +01:00 · 2010-06-10 11:11:38 +01:00 · 081b86d87f
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@ -186,15 +186,11 @@ EXTRA_DSO_LIBS	+= $(STATIC_EXTRA_DSO_LIBS)
 REQUIRES	+= $(STATIC_REQUIRES)
 EXTRA_LIBS	+= $(STATIC_EXTRA_LIBS)

-ifndef MOZILLA_1_9_2_BRANCH
-
 # OpenGL is required by (mozilla/)content/canvas: see (mozilla/)layout/build/Makefile.in.
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 OS_LIBS += -framework OpenGL
 endif

-endif # MOZILLA_1_9_2_BRANCH
-
 endif # BUILD_STATIC_LIBS

 ifeq ($(OS_ARCH),WINNT)
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@ -480,13 +480,6 @@ pref("mail.compose.attachment_reminder_keywords", "chrome://messenger/locale/mes
 pref("mail.compose.attachment_reminder_aggressive", true);

 pref("browser.formfill.enable", true);
-#ifdef MOZILLA_1_9_2_BRANCH
-// Override the all.js values so that unit tests pass and we get sane values.
-pref("browser.formfill.expire_days", 180);
-pref("browser.history_expire_days", 180);
-pref("browser.history_expire_days_min", 90);
-pref("browser.history_expire_sites", 40000);
-#endif

 // Disable autoplay as we don't handle audio elements in emails very well.
 // See bug 515082.
--- a/mail/base/content/utilityOverlay.js
+++ b/mail/base/content/utilityOverlay.js
@ -228,11 +228,7 @@ function buildHelpMenu()
 #ifdef MOZ_UPDATER
  var updates =
      Components.classes["@mozilla.org/updates/update-service;1"].
-#ifdef MOZILLA_1_9_2_BRANCH
-      getService(Components.interfaces.nsIApplicationUpdateService2);
-#else
      getService(Components.interfaces.nsIApplicationUpdateService);
-#endif
  var um =
      Components.classes["@mozilla.org/updates/update-manager;1"].
      getService(Components.interfaces.nsIUpdateManager);
--- a/mail/build.mk
+++ b/mail/build.mk
@ -41,14 +41,6 @@ ifndef LIBXUL_SDK
 include $(topsrcdir)/toolkit/toolkit-tiers.mk
 endif

-## storage backfork.
-# this is temporary until we branch for MOZILLA_1_9_2_BRANCH
-# replace toolkit's storage with our own
-tier_gecko_dirs := $(patsubst storage,../storage-backport,$(tier_gecko_dirs))
-# necko also has a dependency...
-tier_necko_dirs := $(patsubst storage/public,../storage-backport/public,$(tier_necko_dirs))
-
-
 TIERS += app

 ifdef MOZ_EXTENSIONS
--- a/mail/components/Makefile.in
+++ b/mail/components/Makefile.in
@ -54,11 +54,9 @@ ifdef MOZ_SAFE_BROWSING
 DIRS += phishing 
 endif

-ifndef MOZILLA_1_9_2_BRANCH
 ifndef MOZ_PLACES
 DIRS += history
 endif
-endif

 DIRS += build

--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@ -112,11 +112,9 @@ SHARED_LIBRARY_LIBS += ../search/$(LIB_PREFIX)winsearch_s.$(LIB_SUFFIX)
 endif
 endif

-ifndef MOZILLA_1_9_2_BRANCH
 ifndef MOZ_PLACES
 SHARED_LIBRARY_LIBS += ../history/$(LIB_PREFIX)mailhistory_s.$(LIB_SUFFIX)
 endif
-endif

 ifdef MOZILLA_INTERNAL_API
 EXTRA_DSO_LDOPTS += \
--- a/mail/components/build/nsModule.cpp
+++ b/mail/components/build/nsModule.cpp
@ -46,7 +46,6 @@
 #include "nsDogbertProfileMigrator.h"
 #endif

-#ifndef MOZILLA_1_9_2_BRANCH
 #ifndef MOZ_PLACES
 #include "nsDocShellCID.h"
 #include "history.h"
@ -55,7 +54,6 @@ using namespace mozilla;

 NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(History, History::GetSingleton)

-#endif
 #endif

 NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator)
@ -150,14 +148,12 @@ static const nsModuleComponentInfo components[] = {
    "@mozilla.org/mail/windows-search-helper;1",
    nsMailWinSearchHelperConstructor },
 #endif
-#ifndef MOZILLA_1_9_2_BRANCH
 #ifndef MOZ_PLACES
  { "Mail History Empty implementation",
    NS_HISTORYSERVICE_CID,
    NS_IHISTORY_CONTRACTID,
    HistoryConstructor },
 #endif
-#endif
 };

 NS_IMPL_NSGETMODULE(nsMailCompsModule, components)
--- a/mail/components/preferences/advanced.js
+++ b/mail/components/preferences/advanced.js
@ -232,11 +232,7 @@ var gAdvancedPane = {
  {
    var aus = 
        Components.classes["@mozilla.org/updates/update-service;1"].
-#ifdef MOZILLA_1_9_2_BRANCH
-        getService(Components.interfaces.nsIApplicationUpdateService2);
-#else
        getService(Components.interfaces.nsIApplicationUpdateService);
-#endif

    var enabledPref = document.getElementById("app.update.enabled");
    var enableAppUpdate = document.getElementById("enableAppUpdate");
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@ -54,21 +54,8 @@ MOZ_PLACES=
 MOZ_MORKREADER=
 MOZ_MORK=1

-# Needed for the mozilla-central build side of the system.
-# Can be dropped when we branch MOZILLA_1_9_2_BRANCH
-MOZILLA_BRANCH_VERSION=`echo ${MOZILLA_VERSION} | sed -e 's/^\([0-9]\.[0-9]\.[0-9]\).*/\1/;'`
-
-if test "$MOZILLA_BRANCH_VERSION" = "1.9.2"; then
-  MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version-192.txt
-  # Use unofficial branding for the 1.9.2 branch
-  MOZ_BRANDING_DIRECTORY=mail/branding/unofficial
-  MOZ_NO_XPCOM_OBSOLETE=1
-  # MOZ_OJI is only required to be cleared for MOZILLA_1_9_2_BRANCH (OS X).
-  MOZ_OJI=
-else
-  MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
-  MOZ_BRANDING_DIRECTORY=mail/branding/nightly
-fi
+MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
+MOZ_BRANDING_DIRECTORY=mail/branding/nightly

 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`

--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@ -47,13 +47,7 @@
 #ifdef MOZ_IPC
@BINPATH@/mozilla-runtime@BIN_SUFFIX@
 #endif
-#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
-#elifdef XP_WIN32
-@BINPATH@/@DLL_PREFIX@js3250@DLL_SUFFIX@
-#else
-@BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
-#endif
 #ifndef XP_WIN32
@BINPATH@/components/@DLL_PREFIX@jsd@DLL_SUFFIX@
 #else
@ -70,9 +64,7 @@
@BINPATH@/mozcpp19.dll
 #endif
 #endif
-#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
-#endif

 ; Modules
@BINPATH@/modules/*
@ -97,15 +89,11 @@
@BINPATH@/application.ini
@BINPATH@/platform.ini
@BINPATH@/README.txt
-#ifdef MOZILLA_1_9_2_BRANCH
-@BINPATH@/@DLL_PREFIX@sqlite3@DLL_SUFFIX@
-#else
 #ifdef XP_OS2
@BINPATH@/@DLL_PREFIX@mozsqlt3@DLL_SUFFIX@
 #else
@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
 #endif
-#endif
 #ifdef UNIX_BUT_NOT_MAC
@BINPATH@/run-mozilla.sh
@BINPATH@/icons/*.png
@ -157,13 +145,7 @@
@BINPATH@/components/xpcom_components.xpt
@BINPATH@/components/xpcom_ds.xpt
@BINPATH@/components/xpcom_io.xpt
-#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/components/xpcom_threads.xpt
-#elifdef XP_WIN32
-@BINPATH@/components/xpcom_thread.xpt
-#else
-@BINPATH@/components/xpcom_threads.xpt
-#endif
@BINPATH@/components/xpcom_xpti.xpt
@BINPATH@/chrome/toolkit.jar
@BINPATH@/chrome/toolkit.manifest
@ -230,11 +212,7 @@
@BINPATH@/defaults/pref/mdn.js
@BINPATH@/defaults/pref/smime.js
@BINPATH@/defaults/pref/thunderbird-branding.js
-#ifdef MOZILLA_1_9_2_BRANCH
-@BINPATH@/greprefs/*
-#else
@BINPATH@/greprefs.js
-#endif

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; App extensions to Mail
@ -261,9 +239,7 @@
@BINPATH@/components/nsLoginManagerPrompter.js
@BINPATH@/components/storage-Legacy.js
@BINPATH@/components/storage-mozStorage.js
-#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/components/crypto-SDR.js
-#endif

 ; download progress
@BINPATH@/components/nsHelperAppDlg.js
@ -320,18 +296,13 @@

 ; layout
@BINPATH@/components/content_base.xpt
-#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/components/content_canvas.xpt
-#endif
@BINPATH@/components/content_events.xpt
@BINPATH@/components/content_html.xpt
@BINPATH@/components/content_htmldoc.xpt
@BINPATH@/components/content_xmldoc.xpt
@BINPATH@/components/content_xslt.xpt
@BINPATH@/components/content_xtf.xpt
-#ifdef MOZILLA_1_9_2_BRANCH
-@BINPATH@/components/contentprefs.xpt
-#endif
@BINPATH@/components/htmlparser.xpt
@BINPATH@/components/layout_base.xpt
 #ifdef NS_PRINTING
@ -363,21 +334,12 @@
 ; glue: appshell, docshell, uriloader, chrome, components
@BINPATH@/components/appshell.xpt
@BINPATH@/components/appstartup.xpt
-#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/components/docshell.xpt
-#elifdef XP_WIN32
-@BINPATH@/components/docshell_base.xpt
-#else
-@BINPATH@/components/docshell.xpt
-#endif
@BINPATH@/components/uriloader.xpt
@BINPATH@/components/webBrowser_core.xpt
@BINPATH@/components/windowwatcher.xpt
@BINPATH@/components/webbrowserpersist.xpt
@BINPATH@/components/commandhandler.xpt
-#ifdef MOZILLA_1_9_2_BRANCH
-@BINPATH@/components/mozbrwsr.xpt
-#endif

 ; jar
@BINPATH@/components/jar.xpt
@ -545,13 +507,7 @@
@BINPATH@/components/mozfind.xpt
@BINPATH@/components/mimetype.xpt
@BINPATH@/components/parentalcontrols.xpt
-#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/components/proxyObject.xpt
-#elifndef XP_WIN32
-@BINPATH@/components/proxyObjInst.xpt
-#else
-@BINPATH@/components/proxyObject.xpt
-#endif
@BINPATH@/components/exthandler.xpt
@BINPATH@/components/exthelper.xpt
@BINPATH@/components/embed_base.xpt
@ -572,31 +528,6 @@
@BINPATH@/components/cookie.xpt
@BINPATH@/components/places.xpt
@BINPATH@/components/prefetch.xpt
-
-#ifdef MOZILLA_1_9_2_BRANCH
-@BINPATH@/res/arrow.gif
-@BINPATH@/res/arrowd.gif
-@BINPATH@/res/broken-image.png
-@BINPATH@/res/charsetData.properties
-@BINPATH@/res/charsetalias.properties
-@BINPATH@/res/forms.css
-@BINPATH@/res/hiddenWindow.html
-@BINPATH@/res/html.css
-@BINPATH@/res/loading-image.png
-@BINPATH@/res/mathml.css
-@BINPATH@/res/quirk.css
-@BINPATH@/res/ua.css
-@BINPATH@/res/viewsource.css
-#ifdef XP_WIN32
-@BINPATH@/res/wincharset.properties
-#elifdef XP_MACOSX
-@BINPATH@/res/maccharset.properties
-#elifdef XP_OS2
-@BINPATH@/res/os2charset.properties
-#else
-@BINPATH@/res/unixcharset.properties
-#endif
-#endif
@BINPATH@/res/langGroups.properties
@BINPATH@/res/language.properties
@BINPATH@/res/entityTables/*
@ -683,7 +614,6 @@
@BINPATH@/components/@DLL_PREFIX@caps@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@chardet@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@chrome@DLL_SUFFIX@
-#ifndef MOZILLA_1_9_2_BRANCH
 #ifdef XP_OS2
@BINPATH@/components/@DLL_PREFIX@cmdlines@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@gkparser@DLL_SUFFIX@
@ -705,27 +635,6 @@
@BINPATH@/components/@DLL_PREFIX@toolkitcomps@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@xpautocomplete@DLL_SUFFIX@
 #endif
-#elifndef XP_UNIX
-@BINPATH@/components/@DLL_PREFIX@cmdlines@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@gkparser@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@appshell@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@perms@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@spellchk@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@strgcmps@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@tkautoc@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@tkitcmps@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@xpautoc@DLL_SUFFIX@
-#else
-@BINPATH@/components/@DLL_PREFIX@commandlines@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@htmlpars@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@nsappshell@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@permissions@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@storagecomps@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@tkautocomplete@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@toolkitcomps@DLL_SUFFIX@
-@BINPATH@/components/@DLL_PREFIX@xpautocomplete@DLL_SUFFIX@
-#endif
@BINPATH@/components/@DLL_PREFIX@composer@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@cookie@DLL_SUFFIX@
@BINPATH@/components/@DLL_PREFIX@docshell@DLL_SUFFIX@
--- a/mail/makefiles.sh
+++ b/mail/makefiles.sh
@ -63,14 +63,4 @@ mail/themes/qute/Makefile
 $MOZ_BRANDING_DIRECTORY/Makefile
 $MOZ_BRANDING_DIRECTORY/locales/Makefile
 "
-
-# storage-backport stuff.
-# this is temporary until we branch for MOZILLA_1_9_2_BRANCH
-add_makefiles "
-storage-backport/Makefile
-storage-backport/public/Makefile
-storage-backport/src/Makefile
-storage-backport/build/Makefile
-storage-backport/test/Makefile
-"
 fi
--- a/mail/test/mozmill/runtest.py
+++ b/mail/test/mozmill/runtest.py
@ -54,12 +54,10 @@ import socket
 import copy
 SCRIPT_DIRECTORY = os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0])))
 sys.path.append(SCRIPT_DIRECTORY)
-# The try case handles trunk. The exception case handles MOZILLA_1_9_2_BRANCH.
-try:
-    from automation import Automation
-    automation = Automation()
-except ImportError:
-    import automation
+
+from automation import Automation
+automation = Automation()
+
 from automationutils import checkForCrashes
 from time import sleep
 import imp
--- a/mailnews/base/src/nsMsgMailSession.cpp
+++ b/mailnews/base/src/nsMsgMailSession.cpp
@ -48,11 +48,7 @@
 #include "nsIDocShell.h"
 #include "nsIObserverService.h"
 #include "nsIAppStartup.h"
-#ifdef MOZILLA_1_9_2_BRANCH
-#include "nsXPFEComponentsCID.h"
-#else
 #include "nsToolkitCompsCID.h"
-#endif
 #include "nsISupportsPrimitives.h"
 #include "nsIAppShellService.h"
 #include "nsAppShellCID.h"
--- a/mailnews/base/util/nsMsgDBFolder.cpp
+++ b/mailnews/base/util/nsMsgDBFolder.cpp
@ -140,16 +140,6 @@ NS_IMPL_ISUPPORTS_INHERITED6(nsMsgDBFolder, nsRDFResource,
 #include "nsMsgDBFolderAtomList.h"
 #undef MSGDBFOLDER_ATOM

-#ifdef MOZILLA_1_9_2_BRANCH
-
-const nsStaticAtom nsMsgDBFolder::folder_atoms[] = {
-#define MSGDBFOLDER_ATOM(name_, value_) { value_, &nsMsgDBFolder::name_ },
-#include "nsMsgDBFolderAtomList.h"
-#undef MSGDBFOLDER_ATOM
-};
-
-#else // i.e. !MOZILLA_1_9_2_BRANCH
-
 #define MSGDBFOLDER_ATOM(name_, value_) NS_STATIC_ATOM_BUFFER(name_##_buffer, value_)
 #include "nsMsgDBFolderAtomList.h"
 #undef MSGDBFOLDER_ATOM
@ -160,8 +150,6 @@ const nsStaticAtom nsMsgDBFolder::folder_atoms[] = {
 #undef MSGDBFOLDER_ATOM
 };

-#endif // end MOZILLA_1_9_2_BRANCH
-
 nsMsgDBFolder::nsMsgDBFolder(void)
 : mAddListener(PR_TRUE),
  mNewMessages(PR_FALSE),
--- a/mailnews/compose/src/nsMsgComposeService.cpp
+++ b/mailnews/compose/src/nsMsgComposeService.cpp
@ -78,11 +78,7 @@
 #include "nsIMimeMiscStatus.h"
 #include "nsIStreamConverter.h"
 #include "nsMsgMimeCID.h"
-#ifdef MOZILLA_1_9_2_BRANCH
-#include "nsXPFEComponentsCID.h"
-#else
 #include "nsToolkitCompsCID.h"
-#endif
 #include "nsNetUtil.h"
 #include "nsIMsgMailNewsUrl.h"
 #include "nsIInterfaceRequestorUtils.h"
--- a/mailnews/imap/src/nsImapProtocol.cpp
+++ b/mailnews/imap/src/nsImapProtocol.cpp
@ -8825,11 +8825,7 @@ nsImapMockChannel::OnCacheEntryAvailable(nsICacheEntryDescriptor *entry, nsCache
        rv = entry->OpenOutputStream(0, getter_AddRefs(out));
        if (NS_SUCCEEDED(rv))
        {
-          rv = tee->Init(m_channelListener, out
-#ifndef MOZILLA_1_9_2_BRANCH
-                         , nsnull
-#endif
-                         );
+          rv = tee->Init(m_channelListener, out, nsnull);
          m_channelListener = do_QueryInterface(tee);
        }
      }
--- a/mailnews/import/eudora/src/nsEudoraEditor.cpp
+++ b/mailnews/import/eudora/src/nsEudoraEditor.cpp
@ -405,8 +405,6 @@ NS_IMETHODIMP nsEudoraEditor::CanPaste(PRInt32 aSelectionType, PRBool *_retval)
 }


-#ifndef MOZILLA_1_9_2_BRANCH
-
 class nsITransferable;

 // void pasteTransferable(in nsITransferable aTransferable)
@ -422,8 +420,6 @@ NS_IMETHODIMP nsEudoraEditor::CanPasteTransferable(nsITransferable *aTransferabl
  return NS_ERROR_NOT_IMPLEMENTED;
 }

-#endif
-

 // void selectAll ()
 NS_IMETHODIMP nsEudoraEditor::SelectAll()
--- a/mailnews/mime/src/mimemcms.h
+++ b/mailnews/mime/src/mimemcms.h
@ -40,19 +40,6 @@

 #include "mimemsig.h"

-#ifdef MOZILLA_1_9_2_BRANCH
-// On trunk these are defined in nsMimeTypes.h
-#define PARAM_MICALG_SHA256                 "sha-256"
-#define PARAM_MICALG_SHA256_2               "sha256"
-#define PARAM_MICALG_SHA256_3               "2.16.840.1.101.3.4.2.1"
-#define PARAM_MICALG_SHA384                 "sha-384"
-#define PARAM_MICALG_SHA384_2               "sha384"
-#define PARAM_MICALG_SHA384_3               "2.16.840.1.101.3.4.2.2"
-#define PARAM_MICALG_SHA512                 "sha-512"
-#define PARAM_MICALG_SHA512_2               "sha512"
-#define PARAM_MICALG_SHA512_3               "2.16.840.1.101.3.4.2.3"
-#endif
-
 class nsICMSMessage;

 /* The MimeMultipartSignedCMS class implements a multipart/signed MIME 
--- a/mailnews/news/src/nsNNTPProtocol.cpp
+++ b/mailnews/news/src/nsNNTPProtocol.cpp
@ -915,11 +915,7 @@ nsNNTPProtocol::OnCacheEntryAvailable(nsICacheEntryDescriptor *entry, nsCacheAcc
      rv = entry->OpenOutputStream(0, getter_AddRefs(out));
      NS_ENSURE_SUCCESS(rv, rv);

-      rv = tee->Init(m_channelListener, out
-#ifndef MOZILLA_1_9_2_BRANCH
-                     , nsnull
-#endif
-                     );
+      rv = tee->Init(m_channelListener, out, nsnull);
      m_channelListener = do_QueryInterface(tee);
      NS_ENSURE_SUCCESS(rv, rv);
    }
--- a/mailnews/test/performance/bloat/runtest.py
+++ b/mailnews/test/performance/bloat/runtest.py
@ -45,12 +45,8 @@ import sys
 import os
 import shutil

-# The try case handles trunk. The exception case handles MOZILLA_1_9_2_BRANCH.
-try:
-    from automation import Automation
-    automation = Automation()
-except ImportError:
-    import automation
+from automation import Automation
+automation = Automation()

 from automationutils import checkForCrashes

--- a/mailnews/test/resources/logHelper.js
+++ b/mailnews/test/resources/logHelper.js
@ -64,10 +64,7 @@ let _errorConsoleTunnel = {
      // meh, let's just use mark_failure for now.
      // and let's avoid feedback loops (happens in mozmill)
      if ((aMessage instanceof Components.interfaces.nsIScriptError) &&
-        (aMessage.errorMessage.indexOf("Error console says") == -1) &&
-          // MOZILLA_1_9_2_BRANCH fix: gre-resources alias causes an expected
-          //  warning that should not cause us to fail.
-          (aMessage.errorMessage.indexOf("Duplicate resource declaration") == -1))
+        (aMessage.errorMessage.indexOf("Error console says") == -1))
        mark_failure(["Error console says", aMessage]);
    }
    catch (ex) {