Bug 1455707: Fix rebase breakage. r=bustage CLOSED TREE
☠☠ backed out by b4d8ca47f938 ☠ ☠
authorDave Townsend <dtownsend@oxymoronical.com>
Wed, 30 Jan 2019 17:17:24 -0800
changeset 514070 82355ab7e063
parent 514069 b965981c9ce0
child 514071 b4d8ca47f938
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1455707
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1455707: Fix rebase breakage. r=bustage CLOSED TREE
toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -2460,19 +2460,18 @@ static ReturnAbortOnError CheckDowngrade
         rv = prefBranch->PrefHasUserValue("services.sync.username", &hasSync);
         NS_ENSURE_SUCCESS(rv, rv);
       }
 
       nsCOMPtr<nsIWindowWatcher> windowWatcher =
           do_GetService(NS_WINDOWWATCHER_CONTRACTID);
       NS_ENSURE_TRUE(windowWatcher, NS_ERROR_ABORT);
 
-      nsCOMPtr<nsIAppStartup> appStartup =
-          do_GetService(NS_APPSTARTUP_CONTRACTID);
-      NS_ENSURE_TRUE(appStartup, NS_ERROR_ABORT);
+      nsCOMPtr<nsIAppStartup> appStartup(components::AppStartup::Service());
+      NS_ENSURE_TRUE(appStartup, NS_ERROR_FAILURE)
 
       nsCOMPtr<nsIDialogParamBlock> paramBlock =
           do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID);
       NS_ENSURE_TRUE(paramBlock, NS_ERROR_ABORT);
 
       uint8_t flags = 0;
       if (hasSync) {
         flags |= nsIToolkitProfileService::hasSync;