chore(vscode): update to 1.53.2

These conflicts will be resolved in the following commits. We do it this way so
that PR review is possible.

lib/vscode/src/vs/platform/extensionManagement/test/common/extensionGalleryService.test.ts

@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { resolveMarketplaceHeaders } from 'vs/platform/extensionManagement/common/extensionGalleryService';
+import { isUUID } from 'vs/base/common/uuid';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { IFileService } from 'vs/platform/files/common/files';
+import { FileService } from 'vs/platform/files/common/fileService';
+import { NullLogService } from 'vs/platform/log/common/log';
+import product from 'vs/platform/product/common/product';
+import { InMemoryStorageService, IStorageService } from 'vs/platform/storage/common/storage';
+import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider';
+import { URI } from 'vs/base/common/uri';
+import { joinPath } from 'vs/base/common/resources';
+import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { mock } from 'vs/base/test/common/mock';
+
+class EnvironmentServiceMock extends mock<IEnvironmentService>() {
+	constructor(readonly serviceMachineIdResource: URI) {
+		super();
+	}
+}
+
+suite('Extension Gallery Service', () => {
+	const disposables: DisposableStore = new DisposableStore();
+	let fileService: IFileService, environmentService: IEnvironmentService, storageService: IStorageService;
+
+	setup(() => {
+		const serviceMachineIdResource = joinPath(URI.file('tests').with({ scheme: 'vscode-tests' }), 'machineid');
+		environmentService = new EnvironmentServiceMock(serviceMachineIdResource);
+		fileService = disposables.add(new FileService(new NullLogService()));
+		const fileSystemProvider = disposables.add(new InMemoryFileSystemProvider());
+		fileService.registerProvider(serviceMachineIdResource.scheme, fileSystemProvider);
+		storageService = new InMemoryStorageService();
+	});
+
+	teardown(() => disposables.clear());
+
+	test('marketplace machine id', async () => {
+		const headers = await resolveMarketplaceHeaders(product.version, environmentService, fileService, storageService);
+		assert.ok(isUUID(headers['X-Market-User-Id']));
+		const headers2 = await resolveMarketplaceHeaders(product.version, environmentService, fileService, storageService);
+		assert.equal(headers['X-Market-User-Id'], headers2['X-Market-User-Id']);
+	});
+});