Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2 (#8911)

* Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2

* update distro

* fix layering

* update distro

* fix tests

src/vs/workbench/workbench.web.api.ts

@@ -34,6 +34,26 @@ interface IExternalUriResolver {
 	(uri: URI): Promise<URI>;
 }
 
+interface TunnelOptions {
+	remoteAddress: { port: number, host: string };
+	// The desired local port. If this port can't be used, then another will be chosen.
+	localAddressPort?: number;
+	label?: string;
+}
+
+interface Tunnel {
+	remoteAddress: { port: number, host: string };
+	//The complete local address(ex. localhost:1234)
+	localAddress: string;
+	// Implementers of Tunnel should fire onDidDispose when dispose is called.
+	onDidDispose: Event<void>;
+	dispose(): void;
+}
+
+interface ITunnelFactory {
+	(tunnelOptions: TunnelOptions): Thenable<Tunnel> | undefined;
+}
+
 interface IWorkbenchConstructionOptions {
 
 	/**
@@ -104,6 +124,11 @@ interface IWorkbenchConstructionOptions {
 	 */
 	readonly resolveExternalUri?: IExternalUriResolver;
 
+	/**
+	 * Support for creating tunnels.
+	 */
+	readonly tunnelFactory?: ITunnelFactory;
+
 	/**
 	 * Current logging level. Default is `LogLevel.Info`.
 	 */