Bug 947583 - Fix "this.updateProviderURLs is not a function" when toggling "Block reported attack sites" preference r=dolske

From 8ba7cef13d00454ddcdec7e4f8eb32bcb6bee5ac Mon Sep 17 00:00:00 2001
Bug 907129 - Merge closed tabs data when restoreWindow() is called with overwriteTabs=false. r=ttaubert

X-Git-Commit-ID: d51bff1ffaa80d4f441863eb864e7cfd7f8e6a00