Bug 1536663 - Port bug 1375863: Remove/replace use of MOZ_CONTENT_SANDBOX. r=aceman

mail/app/nsMailApp.cpp

@@ -214,12 +214,10 @@ static int do_main(int argc, char* argv[], char* envp[])
     sandboxing::GetInitializedBrokerServices();
   sandboxing::PermissionsService* permissionsService =
     sandboxing::GetPermissionsService();
-#if defined(MOZ_CONTENT_SANDBOX)
   if (!brokerServices) {
     Output("Couldn't initialize the broker services.\n");
     return 255;
   }
-#endif
   config.sandboxBrokerServices = brokerServices;
   config.sandboxPermissionsService = permissionsService;
 #endif

mail/app/profile/all-thunderbird.js

@@ -783,7 +783,7 @@ pref("mail.main_menu.collapse_by_default", true);
 // instead of space in the file name.
 pref("mail.save_msg_filename_underscores_for_space", false);
 
-#ifdef MOZ_CONTENT_SANDBOX
+#ifdef MOZ_SANDBOX
 // This controls the strength of the Windows content process sandbox for testing
 // purposes. This will require a restart.
 // On windows these levels are: