Download chrome-headless-shell by default and use it for the old headless mode (#2495)

kblok · web-flow · commit 3c2533f55988 · 2024-03-13T09:39:30.000-03:00
* Download chrome-headless-shell by default and use it for the old headless mode

* Without the combo
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -25,9 +25,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
-        browser: [CHROME, FIREFOX]
-        mode: [headless, headful, headless-shell]
         include:
           - os: ubuntu-latest
             browser: CHROME
diff --git a/lib/PuppeteerSharp.Tests/ChromeLauncherTests/GetFeaturesTests.cs b/lib/PuppeteerSharp.Tests/ChromeLauncherTests/GetFeaturesTests.cs
@@ -10,35 +10,35 @@ public class GetFeaturesTests : PuppeteerPageBaseTest
         [Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "getFeatures", "returns an empty array when no options are provided")]
         public void ReturnsAnEmptyArrayWhenNoOptionsAreProvided()
         {
-            var result = ChromiumLauncher.GetFeatures("--foo", Array.Empty<string>());
+            var result = ChromeLauncher.GetFeatures("--foo", Array.Empty<string>());
             Assert.IsEmpty(result);
         }
 
         [Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "getFeatures", "returns an empty array when no options match the flag")]
         public void ReturnsAnEmptyArrayWhenNoOptionsMatchTheFlag()
         {
-            var result = ChromiumLauncher.GetFeatures("--foo", new[] { "--bar", "--baz" });
+            var result = ChromeLauncher.GetFeatures("--foo", new[] { "--bar", "--baz" });
             Assert.IsEmpty(result);
         }
 
         [Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "getFeatures", "returns an array of values when options match the flag")]
         public void ReturnsAnArrayOfValuesWhenOptionsMatchTheFlag()
         {
-            var result = ChromiumLauncher.GetFeatures("--foo", new[] { "--foo=bar", "--foo=baz" });
+            var result = ChromeLauncher.GetFeatures("--foo", new[] { "--foo=bar", "--foo=baz" });
             Assert.AreEqual(new[] { "bar", "baz" }, result);
         }
 
         [Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "getFeatures", "does not handle whitespace")]
         public void DoesNotHandleWhitespace()
         {
-            var result = ChromiumLauncher.GetFeatures("--foo", new[] { "--foo bar", "--foo baz " });
+            var result = ChromeLauncher.GetFeatures("--foo", new[] { "--foo bar", "--foo baz " });
             Assert.IsEmpty(result);
         }
 
         [Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "getFeatures", "handles equals sign around the flag and value")]
         public void HandlesEqualsSignAroundTheFlagAndValue()
         {
-            var result = ChromiumLauncher.GetFeatures("--foo", new[] { "--foo=bar", "--foo=baz" });
+            var result = ChromeLauncher.GetFeatures("--foo", new[] { "--foo=bar", "--foo=baz" });
             Assert.AreEqual(new[] { "bar", "baz" }, result);
         }
     }
diff --git a/lib/PuppeteerSharp.Tests/ChromeLauncherTests/RemoveMatchingFlagsTests.cs b/lib/PuppeteerSharp.Tests/ChromeLauncherTests/RemoveMatchingFlagsTests.cs
@@ -11,31 +11,31 @@ public class RemoveMatchingFlagsTests : PuppeteerPageBaseTest
         public void Empty()
         {
             var a = Array.Empty<string>();
-            var result = ChromiumLauncher.RemoveMatchingFlags(a, "--foo");
+            var result = ChromeLauncher.RemoveMatchingFlags(a, "--foo");
             Assert.IsEmpty(result);
         }
 
         [Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "removeMatchingFlags", "with one match")]
         public void WithOneMatch()
         {
             var a = new[] { "--foo=1", "--bar=baz" };
-            var result = ChromiumLauncher.RemoveMatchingFlags(a, "--foo");
+            var result = ChromeLauncher.RemoveMatchingFlags(a, "--foo");
             Assert.AreEqual(new[] { "--bar=baz" }, result);
         }
 
         [Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "removeMatchingFlags", "with multiple matches")]
         public void WithMultipleMatches()
         {
             var a = new[] { "--foo=1", "--bar=baz", "--foo=2" };
-            var result = ChromiumLauncher.RemoveMatchingFlags(a, "--foo");
+            var result = ChromeLauncher.RemoveMatchingFlags(a, "--foo");
             Assert.AreEqual(new[] { "--bar=baz" }, result);
         }
 
         [Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "removeMatchingFlags", "with no matches")]
         public void WithNoMatches()
         {
             var a = new[] { "--foo=1", "--bar=baz" };
-            var result = ChromiumLauncher.RemoveMatchingFlags(a, "--baz");
+            var result = ChromeLauncher.RemoveMatchingFlags(a, "--baz");
             Assert.AreEqual(new[] { "--foo=1", "--bar=baz" }, result);
         }
     }
diff --git a/lib/PuppeteerSharp.Tests/FixturesTests/FixturesTests.cs b/lib/PuppeteerSharp.Tests/FixturesTests/FixturesTests.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
@@ -11,8 +10,6 @@ namespace PuppeteerSharp.Tests.FixturesTests
 {
     public class FixturesTests : PuppeteerBaseTest
     {
-        public FixturesTests() : base() { }
-
         [Test, Retry(2), PuppeteerTest("fixtures.spec", "Fixtures", "should dump browser process stderr")]
         public void ShouldDumpBrowserProcessStderr()
         {
@@ -38,23 +35,23 @@ public async Task ShouldCloseTheBrowserWhenTheConnectedProcessCloses()
         {
             var browserClosedTaskWrapper = new TaskCompletionSource<bool>();
             using var browserFetcher = new BrowserFetcher(SupportedBrowser.Chrome);
-            var ChromiumLauncher = new ChromiumLauncher(
+            var chromiumLauncher = new ChromeLauncher(
                 browserFetcher.GetInstalledBrowsers().First().GetExecutablePath(),
                 new LaunchOptions { Headless = true });
 
-            await ChromiumLauncher.StartAsync().ConfigureAwait(false);
+            await chromiumLauncher.StartAsync().ConfigureAwait(false);
 
             var browser = await Puppeteer.ConnectAsync(new ConnectOptions
             {
-                BrowserWSEndpoint = ChromiumLauncher.EndPoint
+                BrowserWSEndpoint = chromiumLauncher.EndPoint
             });
 
             browser.Disconnected += (_, _) =>
             {
                 browserClosedTaskWrapper.SetResult(true);
             };
 
-            KillProcess(ChromiumLauncher.Process.Id);
+            KillProcess(chromiumLauncher.Process.Id);
 
             await browserClosedTaskWrapper.Task;
             Assert.True(browser.IsClosed);
diff --git a/lib/PuppeteerSharp/BrowserData/Chrome.cs b/lib/PuppeteerSharp/BrowserData/Chrome.cs
@@ -13,7 +13,7 @@ public static class Chrome
         /// <summary>
         /// Default chrome build.
         /// </summary>
-        public static string DefaultBuildId => "122.0.6261.69";
+        public static string DefaultBuildId => "122.0.6261.111";
 
         internal static async Task<string> ResolveBuildIdAsync(ChromeReleaseChannel channel)
             => (await GetLastKnownGoodReleaseForChannel(channel).ConfigureAwait(false)).Version;
diff --git a/lib/PuppeteerSharp/BrowserData/ChromeHeadlessShell.cs b/lib/PuppeteerSharp/BrowserData/ChromeHeadlessShell.cs
@@ -0,0 +1,44 @@
+using System;
+using System.IO;
+
+namespace PuppeteerSharp.BrowserData
+{
+    /// <summary>
+    /// Chrome info.
+    /// </summary>
+    public static class ChromeHeadlessShell
+    {
+        internal static string ResolveDownloadUrl(Platform platform, string buildId, string baseUrl)
+            => $"{baseUrl ?? "https://storage.googleapis.com/chrome-for-testing-public"}/{string.Join("/", ResolveDownloadPath(platform, buildId))}";
+
+        internal static string RelativeExecutablePath(Platform platform, string buildId)
+            => platform switch
+            {
+                Platform.MacOS or Platform.MacOSArm64 => Path.Combine(
+                    "chrome-headless-shell-" + GetFolder(platform),
+                    "chrome-headless-shell"),
+                Platform.Linux => Path.Combine("chrome-headless-shell-linux64", "chrome-headless-shell"),
+                Platform.Win32 or Platform.Win64 => Path.Combine("chrome-headless-shell-" + GetFolder(platform), "chrome-headless-shell.exe"),
+                _ => throw new ArgumentException("Invalid platform", nameof(platform)),
+            };
+
+        private static string[] ResolveDownloadPath(Platform platform, string buildId)
+            => new string[]
+            {
+                buildId,
+                GetFolder(platform),
+                $"chrome-headless-shell-{GetFolder(platform)}.zip",
+            };
+
+        private static string GetFolder(Platform platform)
+            => platform switch
+            {
+                Platform.Linux => "linux64",
+                Platform.MacOSArm64 => "mac-arm64",
+                Platform.MacOS => "mac-x64",
+                Platform.Win32 => "win32",
+                Platform.Win64 => "win64",
+                _ => throw new PuppeteerException($"Unknown platform: {platform}"),
+            };
+    }
+}
diff --git a/lib/PuppeteerSharp/BrowserData/InstalledBrowser.cs b/lib/PuppeteerSharp/BrowserData/InstalledBrowser.cs
@@ -9,9 +9,10 @@ namespace PuppeteerSharp.BrowserData
     /// </summary>
     public class InstalledBrowser
     {
-        internal static readonly Dictionary<SupportedBrowser, Func<Platform, string, string>> _executablePathByBrowser = new()
+        private static readonly Dictionary<SupportedBrowser, Func<Platform, string, string>> _executablePathByBrowser = new()
         {
             [SupportedBrowser.Chrome] = Chrome.RelativeExecutablePath,
+            [SupportedBrowser.ChromeHeadlessShell] = ChromeHeadlessShell.RelativeExecutablePath,
             [SupportedBrowser.Chromium] = Chromium.RelativeExecutablePath,
             [SupportedBrowser.Firefox] = Firefox.RelativeExecutablePath,
         };
diff --git a/lib/PuppeteerSharp/BrowserFetcher.cs b/lib/PuppeteerSharp/BrowserFetcher.cs
@@ -23,6 +23,7 @@ public class BrowserFetcher : IBrowserFetcher
         private static readonly Dictionary<SupportedBrowser, Func<Platform, string, string, string>> _downloadsUrl = new()
         {
             [SupportedBrowser.Chrome] = Chrome.ResolveDownloadUrl,
+            [SupportedBrowser.ChromeHeadlessShell] = ChromeHeadlessShell.ResolveDownloadUrl,
             [SupportedBrowser.Chromium] = Chromium.ResolveDownloadUrl,
             [SupportedBrowser.Firefox] = Firefox.ResolveDownloadUrl,
         };
@@ -128,42 +129,14 @@ public void Uninstall(string buildId)
         /// <inheritdoc/>
         public async Task<InstalledBrowser> DownloadAsync(string buildId)
         {
-            var url = _downloadsUrl[Browser](Platform, buildId, BaseUrl);
-            var fileName = url.Split('/').Last();
-            var cache = new Cache(CacheDir);
-            var archivePath = Path.Combine(CacheDir, fileName);
-            var downloadFolder = new DirectoryInfo(CacheDir);
-
-            if (!downloadFolder.Exists)
-            {
-                downloadFolder.Create();
-            }
-
-            if (DownloadProgressChanged != null)
-            {
-                _webClient.DownloadProgressChanged += DownloadProgressChanged;
-            }
+            var installedBrowser = await DownloadAsync(Browser, buildId).ConfigureAwait(false);
 
-            var outputPath = cache.GetInstallationDir(Browser, Platform, buildId);
-
-            if (new DirectoryInfo(outputPath).Exists)
+            if (Browser == SupportedBrowser.Chrome)
             {
-                return new InstalledBrowser(cache, Browser, buildId, Platform);
+                await DownloadAsync(SupportedBrowser.ChromeHeadlessShell, buildId).ConfigureAwait(false);
             }
 
-            try
-            {
-                await _customFileDownload(url, archivePath).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                throw new PuppeteerException($"Failed to download {Browser} for {Platform} from {url}", ex);
-            }
-
-            await UnpackArchiveAsync(archivePath, outputPath, fileName).ConfigureAwait(false);
-            new FileInfo(archivePath).Delete();
-
-            return new InstalledBrowser(cache, Browser, buildId, Platform);
+            return installedBrowser;
         }
 
         /// <inheritdoc/>
@@ -267,6 +240,46 @@ private static void ExtractTar(string zipPath, string folderPath)
             process.WaitForExit();
         }
 
+        private async Task<InstalledBrowser> DownloadAsync(SupportedBrowser browser, string buildId)
+        {
+            var url = _downloadsUrl[browser](Platform, buildId, BaseUrl);
+            var fileName = url.Split('/').Last();
+            var cache = new Cache(CacheDir);
+            var archivePath = Path.Combine(CacheDir, fileName);
+            var downloadFolder = new DirectoryInfo(CacheDir);
+
+            if (!downloadFolder.Exists)
+            {
+                downloadFolder.Create();
+            }
+
+            if (DownloadProgressChanged != null)
+            {
+                _webClient.DownloadProgressChanged += DownloadProgressChanged;
+            }
+
+            var outputPath = cache.GetInstallationDir(browser, Platform, buildId);
+
+            if (new DirectoryInfo(outputPath).Exists)
+            {
+                return new InstalledBrowser(cache, browser, buildId, Platform);
+            }
+
+            try
+            {
+                await _customFileDownload(url, archivePath).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                throw new PuppeteerException($"Failed to download {browser} for {Platform} from {url}", ex);
+            }
+
+            await UnpackArchiveAsync(archivePath, outputPath, fileName).ConfigureAwait(false);
+            new FileInfo(archivePath).Delete();
+
+            return new InstalledBrowser(cache, browser, buildId, Platform);
+        }
+
         private Task InstallDMGAsync(string dmgPath, string folderPath)
         {
             try
diff --git a/lib/PuppeteerSharp/ChromeLauncher.cs b/lib/PuppeteerSharp/ChromeLauncher.cs
@@ -11,16 +11,16 @@ namespace PuppeteerSharp
     /// Represents a Chromium process and any associated temporary user data directory that have created
     /// by Puppeteer and therefore must be cleaned up when no longer needed.
     /// </summary>
-    public class ChromiumLauncher : LauncherBase
+    public class ChromeLauncher : LauncherBase
     {
         private const string UserDataDirArgument = "--user-data-dir";
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ChromiumLauncher"/> class.
+        /// Initializes a new instance of the <see cref="ChromeLauncher"/> class.
         /// </summary>
         /// <param name="executable">Full path of executable.</param>
         /// <param name="options">Options for launching Chromium.</param>
-        public ChromiumLauncher(string executable, LaunchOptions options)
+        public ChromeLauncher(string executable, LaunchOptions options)
             : base(executable, options)
         {
             List<string> chromiumArgs;
diff --git a/lib/PuppeteerSharp/LaunchOptions.cs b/lib/PuppeteerSharp/LaunchOptions.cs
@@ -102,13 +102,13 @@ public bool Devtools
         public bool LogProcess { get; set; }
 
         /// <summary>
-        /// If <c>true</c>, then do not use <see cref="ChromiumLauncher.GetDefaultArgs"/>.
+        /// If <c>true</c>, then do not use <see cref="ChromeLauncher.GetDefaultArgs"/>.
         /// Dangerous option; use with care. Defaults to <c>false</c>.
         /// </summary>
         public bool IgnoreDefaultArgs { get; set; }
 
         /// <summary>
-        /// if <see cref="IgnoreDefaultArgs"/> is set to <c>false</c> this list will be used to filter <see cref="ChromiumLauncher.GetDefaultArgs"/>.
+        /// if <see cref="IgnoreDefaultArgs"/> is set to <c>false</c> this list will be used to filter <see cref="ChromeLauncher.GetDefaultArgs"/>.
         /// </summary>
         public string[] IgnoredDefaultArgs
         {
diff --git a/lib/PuppeteerSharp/Launcher.cs b/lib/PuppeteerSharp/Launcher.cs
@@ -55,7 +55,7 @@ public async Task<IBrowser> LaunchAsync(LaunchOptions options)
 
             Process = options.Browser switch
             {
-                SupportedBrowser.Chrome or SupportedBrowser.Chromium => new ChromiumLauncher(executable, options),
+                SupportedBrowser.Chrome or SupportedBrowser.Chromium => new ChromeLauncher(executable, options),
                 SupportedBrowser.Firefox => new FirefoxLauncher(executable, options),
                 _ => throw new ArgumentException("Invalid product"),
             };
@@ -187,7 +187,7 @@ private void EnsureSingleLaunchOrConnect()
             _processLaunched = true;
         }
 
-        private string ResolveExecutablePath(string buildId)
+        private string ResolveExecutablePath(HeadlessMode headlessMode, string buildId)
         {
             var executablePath = Environment.GetEnvironmentVariable("PUPPETEER_EXECUTABLE_PATH");
 
@@ -203,7 +203,7 @@ private string ResolveExecutablePath(string buildId)
 
             return new InstalledBrowser(
                 new Cache(),
-                _browser,
+                headlessMode == HeadlessMode.Shell && _browser == SupportedBrowser.Chrome ? SupportedBrowser.ChromeHeadlessShell : _browser,
                 buildId,
                 BrowserFetcher.GetCurrentPlatform()).GetExecutablePath();
         }
@@ -215,7 +215,7 @@ private string GetExecutablePath(LaunchOptions options, string buildId)
                 return ComputeSystemExecutablePath(_browser, options.Channel.Value);
             }
 
-            return ResolveExecutablePath(buildId);
+            return ResolveExecutablePath(options.HeadlessMode, buildId);
         }
 
         private string ComputeSystemExecutablePath(SupportedBrowser browser, ChromeReleaseChannel channel)
diff --git a/lib/PuppeteerSharp/Puppeteer.cs b/lib/PuppeteerSharp/Puppeteer.cs
@@ -64,7 +64,7 @@ public static class Puppeteer
         public static string[] GetDefaultArgs(LaunchOptions options = null)
             => (options?.Browser ?? SupportedBrowser.Firefox) == SupportedBrowser.Firefox
                 ? FirefoxLauncher.GetDefaultArgs(options ?? new LaunchOptions())
-                : ChromiumLauncher.GetDefaultArgs(options ?? new LaunchOptions());
+                : ChromeLauncher.GetDefaultArgs(options ?? new LaunchOptions());
 
         /// <summary>
         /// The method launches a browser instance with given arguments. The browser will be closed when the Browser is disposed.
diff --git a/lib/PuppeteerSharp/SupportedBrowser.cs b/lib/PuppeteerSharp/SupportedBrowser.cs
@@ -19,5 +19,10 @@ public enum SupportedBrowser
         /// Chromium.
         /// </summary>
         Chromium,
+
+        /// <summary>
+        /// Chrome headless shell.
+        /// </summary>
+        ChromeHeadlessShell,
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,35 +10,35 @@ public class GetFeaturesTests : PuppeteerPageBaseTest`
`10`	`10`	`[Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "getFeatures", "returns an empty array when no options are provided")]`
`11`	`11`	`public void ReturnsAnEmptyArrayWhenNoOptionsAreProvided()`
`12`	`12`	`{`
`13`		`- var result = ChromiumLauncher.GetFeatures("--foo", Array.Empty<string>());`
	`13`	`+ var result = ChromeLauncher.GetFeatures("--foo", Array.Empty<string>());`
`14`	`14`	`Assert.IsEmpty(result);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`[Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "getFeatures", "returns an empty array when no options match the flag")]`
`18`	`18`	`public void ReturnsAnEmptyArrayWhenNoOptionsMatchTheFlag()`
`19`	`19`	`{`
`20`		`- var result = ChromiumLauncher.GetFeatures("--foo", new[] { "--bar", "--baz" });`
	`20`	`+ var result = ChromeLauncher.GetFeatures("--foo", new[] { "--bar", "--baz" });`
`21`	`21`	`Assert.IsEmpty(result);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`[Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "getFeatures", "returns an array of values when options match the flag")]`
`25`	`25`	`public void ReturnsAnArrayOfValuesWhenOptionsMatchTheFlag()`
`26`	`26`	`{`
`27`		`- var result = ChromiumLauncher.GetFeatures("--foo", new[] { "--foo=bar", "--foo=baz" });`
	`27`	`+ var result = ChromeLauncher.GetFeatures("--foo", new[] { "--foo=bar", "--foo=baz" });`
`28`	`28`	`Assert.AreEqual(new[] { "bar", "baz" }, result);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`[Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "getFeatures", "does not handle whitespace")]`
`32`	`32`	`public void DoesNotHandleWhitespace()`
`33`	`33`	`{`
`34`		`- var result = ChromiumLauncher.GetFeatures("--foo", new[] { "--foo bar", "--foo baz " });`
	`34`	`+ var result = ChromeLauncher.GetFeatures("--foo", new[] { "--foo bar", "--foo baz " });`
`35`	`35`	`Assert.IsEmpty(result);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`[Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "getFeatures", "handles equals sign around the flag and value")]`
`39`	`39`	`public void HandlesEqualsSignAroundTheFlagAndValue()`
`40`	`40`	`{`
`41`		`- var result = ChromiumLauncher.GetFeatures("--foo", new[] { "--foo=bar", "--foo=baz" });`
	`41`	`+ var result = ChromeLauncher.GetFeatures("--foo", new[] { "--foo=bar", "--foo=baz" });`
`42`	`42`	`Assert.AreEqual(new[] { "bar", "baz" }, result);`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,31 +11,31 @@ public class RemoveMatchingFlagsTests : PuppeteerPageBaseTest`
`11`	`11`	`public void Empty()`
`12`	`12`	`{`
`13`	`13`	`var a = Array.Empty<string>();`
`14`		`- var result = ChromiumLauncher.RemoveMatchingFlags(a, "--foo");`
	`14`	`+ var result = ChromeLauncher.RemoveMatchingFlags(a, "--foo");`
`15`	`15`	`Assert.IsEmpty(result);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`[Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "removeMatchingFlags", "with one match")]`
`19`	`19`	`public void WithOneMatch()`
`20`	`20`	`{`
`21`	`21`	`var a = new[] { "--foo=1", "--bar=baz" };`
`22`		`- var result = ChromiumLauncher.RemoveMatchingFlags(a, "--foo");`
	`22`	`+ var result = ChromeLauncher.RemoveMatchingFlags(a, "--foo");`
`23`	`23`	`Assert.AreEqual(new[] { "--bar=baz" }, result);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`[Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "removeMatchingFlags", "with multiple matches")]`
`27`	`27`	`public void WithMultipleMatches()`
`28`	`28`	`{`
`29`	`29`	`var a = new[] { "--foo=1", "--bar=baz", "--foo=2" };`
`30`		`- var result = ChromiumLauncher.RemoveMatchingFlags(a, "--foo");`
	`30`	`+ var result = ChromeLauncher.RemoveMatchingFlags(a, "--foo");`
`31`	`31`	`Assert.AreEqual(new[] { "--bar=baz" }, result);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`[Test, Retry(2), PuppeteerTest("ChromeLauncher.test.ts", "removeMatchingFlags", "with no matches")]`
`35`	`35`	`public void WithNoMatches()`
`36`	`36`	`{`
`37`	`37`	`var a = new[] { "--foo=1", "--bar=baz" };`
`38`		`- var result = ChromiumLauncher.RemoveMatchingFlags(a, "--baz");`
	`38`	`+ var result = ChromeLauncher.RemoveMatchingFlags(a, "--baz");`
`39`	`39`	`Assert.AreEqual(new[] { "--foo=1", "--bar=baz" }, result);`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,10 @@ namespace PuppeteerSharp.BrowserData`
`9`	`9`	`/// </summary>`
`10`	`10`	`public class InstalledBrowser`
`11`	`11`	`{`
`12`		`- internal static readonly Dictionary<SupportedBrowser, Func<Platform, string, string>> _executablePathByBrowser = new()`
	`12`	`+ private static readonly Dictionary<SupportedBrowser, Func<Platform, string, string>> _executablePathByBrowser = new()`
`13`	`13`	`{`
`14`	`14`	`[SupportedBrowser.Chrome] = Chrome.RelativeExecutablePath,`
	`15`	`+ [SupportedBrowser.ChromeHeadlessShell] = ChromeHeadlessShell.RelativeExecutablePath,`
`15`	`16`	`[SupportedBrowser.Chromium] = Chromium.RelativeExecutablePath,`
`16`	`17`	`[SupportedBrowser.Firefox] = Firefox.RelativeExecutablePath,`
`17`	`18`	`};`