Remove some junk

browser/base/content/browser-siteIdentity.js

@@ -50,7 +50,7 @@ var gIdentityHandler = {
    * RegExp used to decide if an about url should be shown as being part of
    * the browser UI.
    */
-  _secureInternalUIWhitelist: /^(?:accounts|addons|cache|config|crashes|customizing|downloads|healthreport|license|permissions|preferences|rights|sessionrestore|support|welcomeback)(?:[?#]|$)/i,
+  _secureInternalUIWhitelist: /^(?:accounts|addons|cache|config|crashes|customizing|downloads|healthreport|license|permissions|preferences|rights|sessionrestore|support)(?:[?#]|$)/i,
 
   get _isBroken() {
     return this._state & Ci.nsIWebProgressListener.STATE_IS_BROKEN;

browser/base/content/browser.js

@@ -608,9 +608,7 @@ var gInitialPages = [
   "about:newtab",
   "about:home",
   "about:privatebrowsing",
-  "about:welcomeback",
   "about:sessionrestore",
-  "about:welcome",
   "about:newinstall",
 ];
 

browser/base/content/test/general/browser_testOpenNewRemoteTabsFromNonRemoteBrowsers.js

@@ -3,7 +3,7 @@
  */
 
 const OPEN_LOCATION_PREF = "browser.link.open_newwindow";
-const NON_REMOTE_PAGE = "about:welcomeback";
+const NON_REMOTE_PAGE = "about:support";
 
 const { PrivateBrowsingUtils } = ChromeUtils.import(
   "resource://gre/modules/PrivateBrowsingUtils.jsm"

browser/base/jar.mn

@@ -10,9 +10,6 @@ browser.jar:
         content/browser/aboutDialog.css               (content/aboutDialog.css)
         content/browser/aboutRestartRequired.js       (content/aboutRestartRequired.js)
         content/browser/aboutRestartRequired.xhtml    (content/aboutRestartRequired.xhtml)
-        content/browser/aboutRobots.xhtml             (content/aboutRobots.xhtml)
-        content/browser/aboutRobots.js                (content/aboutRobots.js)
-        content/browser/aboutRobots.css               (content/aboutRobots.css)
 
         content/browser/illustrations/error-connection-failure.svg (content/illustrations/error-connection-failure.svg)
         content/browser/illustrations/error-server-not-found.svg (content/illustrations/error-server-not-found.svg)
@@ -21,7 +18,6 @@ browser.jar:
         content/browser/illustrations/blue-berror.svg (content/illustrations/blue-berror.svg)
         content/browser/aboutNetError.xhtml            (content/aboutNetError.xhtml)
         content/browser/aboutNetError.js               (content/aboutNetError.js)
-        content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
         content/browser/aboutFrameCrashed.html        (content/aboutFrameCrashed.html)
         content/browser/aboutTabCrashed.css           (content/aboutTabCrashed.css)
         content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)

browser/components/about/AboutRedirector.cpp

@@ -70,13 +70,8 @@ static const RedirEntry kRedirMap[] = {
     {"rights", "chrome://global/content/aboutRights.xhtml",
      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
          nsIAboutModule::ALLOW_SCRIPT},
-    {"robots", "chrome://browser/content/aboutRobots.xhtml",
-     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
-         nsIAboutModule::ALLOW_SCRIPT},
     {"sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml",
      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},
-    {"welcomeback", "chrome://browser/content/aboutWelcomeBack.xhtml",
-     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},
     // Actual activity stream URL for home and newtab are set in channel
     // creation
     {"home", "about:blank", ACTIVITY_STREAM_FLAGS},

browser/components/about/components.conf

@@ -18,11 +18,9 @@ pages = [
     'reader',
     'restartrequired',
     'rights',
-    'robots',
     'sessionrestore',
     'tabcrashed',
     'welcome',
-    'welcomeback',
 ]
 
 if defined('NIGHTLY_BUILD'):

browser/components/migration/jar.mn

@@ -5,4 +5,3 @@
 browser.jar:
 *  content/browser/migration/migration.xul                    (content/migration.xul)
    content/browser/migration/migration.js                     (content/migration.js)
-   content/browser/aboutWelcomeBack.xhtml                     (content/aboutWelcomeBack.xhtml)

browser/components/migration/tests/marionette/test_refresh_firefox.py

@@ -346,7 +346,7 @@ def checkSession(self):
         tabURIs = self.runCode("""
           return [... gBrowser.browsers].map(b => b.currentURI && b.currentURI.spec)
         """)
-        self.assertSequenceEqual(tabURIs, ["about:welcomeback"])
+        self.assertSequenceEqual(tabURIs, ["about:welcome"])
 
         # Dismiss modal dialog if any. This is mainly to dismiss the check for
         # default browser dialog if it shows up.

browser/components/sessionstore/SessionMigration.jsm

@@ -66,7 +66,7 @@ var SessionMigrationInternal = {
       win._closedTabs = [];
       return win;
     });
-    let url = "about:welcomeback";
+    let url = "about:welcome";
     let formdata = { id: { sessionData: state }, url };
     let entry = {
       url,

browser/components/sessionstore/SessionStore.jsm

@@ -730,14 +730,6 @@ var SessionStoreInternal = {
                   E10SUtils.SERIALIZED_SYSTEMPRINCIPAL,
               };
               state = { windows: [{ tabs: [{ entries: [entry], formdata }] }] };
-            } else if (
-              this._hasSingleTabWithURL(state.windows, "about:welcomeback")
-            ) {
-              // On a single about:welcomeback URL that crashed, replace about:welcomeback
-              // with about:sessionrestore, to make clear to the user that we crashed.
-              state.windows[0].tabs[0].entries[0].url = "about:sessionrestore";
-              state.windows[0].tabs[0].entries[0].triggeringPrincipal_base64 =
-                E10SUtils.SERIALIZED_SYSTEMPRINCIPAL;
             }
           }
 
@@ -5288,8 +5280,7 @@ var SessionStoreInternal = {
 
     // don't wrap a single about:sessionrestore page
     if (
-      this._hasSingleTabWithURL(winData, "about:sessionrestore") ||
-      this._hasSingleTabWithURL(winData, "about:welcomeback")
+      this._hasSingleTabWithURL(winData, "about:sessionrestore")
     ) {
       return false;
     }

browser/locales/en-US/browser/aboutSessionRestore.ftl

@@ -33,18 +33,3 @@ restore-page-try-again-button =
 restore-page-close-button =
     .label = Start New Session
     .accesskey = N
-
-## The following strings are used in about:welcomeback
-welcome-back-tab-title = Success!
-welcome-back-page-title = Success!
-welcome-back-page-info = { -brand-short-name } is ready to go.
-
-welcome-back-restore-button =
-    .label = Let’s go!
-    .accesskey = L
-
-welcome-back-restore-all-label = Restore all windows & tabs
-welcome-back-restore-some-label = Restore only the ones you want
-
-welcome-back-page-info-link = Your add-ons and customizations have been removed and your browser settings have been restored to their defaults. If this didn’t fix your issue, <a data-l10n-name="link-more">learn more about what you can do.</a>
-

browser/moz.configure

@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 imply_option('MOZ_PLACES', True)
-imply_option('MOZ_SERVICES_HEALTHREPORT', True)
 imply_option('MOZ_SERVICES_SYNC', True)
 imply_option('MOZ_DEDICATED_PROFILES', True)
 imply_option('MOZ_BLOCK_PROFILE_DOWNGRADE', True)