Bug 1295542 - Don't remove chrome.manifest on upgrades. r=rstrong

Author: glandium

browser/installer/removed-files.in

@@ -69,16 +69,6 @@
 # Firefox 27
 @DIR_MACOS@distribution/extensions/testpilot@labs.mozilla.com.xpi
 
-# Some users are ending up with unpacked chrome instead of omni.ja. This
-# causes updates to break badly, see bug 1063052. Removing the toplevel
-# chrome.manifest causes us to use the updated omni.ja.
-#ifndef MOZ_GTK
-  @DIR_MACOS@chrome.manifest
-  #ifdef XP_MACOSX
-    @DIR_RESOURCES@chrome.manifest
-  #endif
-#endif
-
 # Mac OS X v2 signing removals
 #ifdef XP_MACOSX
   @DIR_MACOS@active-update.xml

browser/installer/windows/nsis/shared.nsh

@@ -803,14 +803,6 @@
 
 ; Removes various directories and files for reasons noted below.
 !macro RemoveDeprecatedFiles
-  ; Some users are ending up with unpacked chrome instead of omni.ja. This
-  ; causes Firefox to break badly after upgrading from Firefox 31, see bug
-  ; 1063052. Removing the chrome.manifest from the install directory causes
-  ; Firefox to use the updated omni.ja so it won't crash.
-  ${If} ${FileExists} "$INSTDIR\chrome.manifest"
-    Delete "$INSTDIR\chrome.manifest"
-  ${EndIf}
-
   ; Remove talkback if it is present (remove after bug 386760 is fixed)
   ${If} ${FileExists} "$INSTDIR\extensions\talkback@mozilla.org"
     RmDir /r /REBOOTOK "$INSTDIR\extensions\talkback@mozilla.org"