chore: Align code/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts with upstream

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

Author: RomanNikitenko

.rebase/CHANGELOG.md

@@ -48,7 +48,6 @@ https://github.com/che-incubator/che-code/pull/528
 https://github.com/che-incubator/che-code/pull/526
 
 - code/package.json
-- code/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts
 ---
 
 #### @svor

.rebase/replace/code/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts.json

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { BrowserWindow, Details, MessageChannelMain, app, utilityProcess, UtilityProcess as ElectronUtilityProcess, ForkOptions } from 'electron';
+import { BrowserWindow, Details, MessageChannelMain, app, utilityProcess, UtilityProcess as ElectronUtilityProcess } from 'electron';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { ILogService } from '../../log/common/log.js';
@@ -18,7 +18,6 @@ import { removeDangerousEnvVariables } from '../../../base/common/processes.js';
 import { deepClone } from '../../../base/common/objects.js';
 import { isWindows } from '../../../base/common/platform.js';
 import { isUNCAccessRestrictionsDisabled, getUNCHostAllowlist } from '../../../base/node/unc.js';
-import { upcast } from '../../../base/common/types.js';
 
 export interface IUtilityProcessConfiguration {
 
@@ -247,16 +246,14 @@ export class UtilityProcess extends Disposable {
 		this.log('creating new...', Severity.Info);
 
 		// Fork utility process
-		this.process = utilityProcess.fork(modulePath, args, upcast<ForkOptions, ForkOptions & {
-			respondToAuthRequestsFromMainProcess?: boolean;
-		}>({
+		this.process = utilityProcess.fork(modulePath, args, {
 			serviceName,
 			env,
 			execArgv, // !!! Add `--trace-warnings` for node.js tracing !!!
 			allowLoadingUnsignedLibraries,
 			respondToAuthRequestsFromMainProcess,
 			stdio
-		}));
+		});
 
 		// Register to events
 		this.registerListeners(this.process, this.configuration, serviceName);

code/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts

@@ -474,8 +474,6 @@ resolve_conflicts() {
       apply_changes "$conflictingFile"
     elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts" ]]; then
       apply_changes "$conflictingFile"
-    elif [[ "$conflictingFile" == "code/src/vs/platform/utilityProcess/electron-main/utilityProcess.ts" ]]; then
-      apply_changes "$conflictingFile"
     elif [[ "$conflictingFile" == "code/src/vs/platform/extensionManagement/node/extensionManagementService.ts" ]]; then
       apply_changes "$conflictingFile"
     elif [[ "$conflictingFile" == "code/src/vs/platform/extensionManagement/common/abstractExtensionManagementService.ts" ]]; then