Chrome and Edge are good

Author: nvborisenko

dotnet/src/webdriver/Chrome/ChromeDriver.cs

@@ -83,7 +83,7 @@ public ChromeDriver()
         /// </summary>
         /// <param name="options">The <see cref="ChromeOptions"/> to be used with the Chrome driver.</param>
         public ChromeDriver(ChromeOptions options)
-            : this(ChromeDriverService.CreateDefaultService(), options, RemoteWebDriver.DefaultCommandTimeout)
+            : this(ChromeDriverService.CreateDefaultService(), disposeService: true, options, RemoteWebDriver.DefaultCommandTimeout)
         {
         }
 
@@ -125,7 +125,7 @@ public ChromeDriver(string chromeDriverDirectory, ChromeOptions options)
         /// <param name="options">The <see cref="ChromeOptions"/> to be used with the Chrome driver.</param>
         /// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>
         public ChromeDriver(string chromeDriverDirectory, ChromeOptions options, TimeSpan commandTimeout)
-            : this(ChromeDriverService.CreateDefaultService(chromeDriverDirectory), options, commandTimeout)
+            : this(ChromeDriverService.CreateDefaultService(chromeDriverDirectory), disposeService: true, options, commandTimeout)
         {
         }
 
@@ -147,7 +147,12 @@ public ChromeDriver(ChromeDriverService service, ChromeOptions options)
         /// <param name="options">The <see cref="ChromeOptions"/> to be used with the Chrome driver.</param>
         /// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>
         public ChromeDriver(ChromeDriverService service, ChromeOptions options, TimeSpan commandTimeout)
-            : base(service, options, commandTimeout)
+            : this(service, disposeService: false, options, commandTimeout)
+        {
+        }
+
+        private ChromeDriver(ChromeDriverService service, bool disposeService, ChromeOptions options, TimeSpan commandTimeout)
+            : base(service, disposeService, options, commandTimeout)
         {
             this.AddCustomChromeCommands();
         }

dotnet/src/webdriver/Chromium/ChromiumDriver.cs

@@ -107,6 +107,7 @@ public class ChromiumDriver : WebDriver, ISupportsLogs, IDevTools
         public static readonly string SetPermissionCommand = "setPermission";
 
         private readonly ChromiumDriverService driverService;
+        private readonly bool disposeDriverService;
         private readonly string optionsCapabilityName;
         private DevToolsSession devToolsSession;
 
@@ -125,12 +126,14 @@ public class ChromiumDriver : WebDriver, ISupportsLogs, IDevTools
         /// Initializes a new instance of the <see cref="ChromiumDriver"/> class using the specified <see cref="ChromiumDriverService"/>.
         /// </summary>
         /// <param name="service">The <see cref="ChromiumDriverService"/> to use.</param>
+        /// <param name="disposeService">Wheter to dispose the original <paramref name="service"/>.</param>
         /// <param name="options">The <see cref="ChromiumOptions"/> to be used with the ChromiumDriver.</param>
         /// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>
-        protected ChromiumDriver(ChromiumDriverService service, ChromiumOptions options, TimeSpan commandTimeout)
+        protected ChromiumDriver(ChromiumDriverService service, bool disposeService, ChromiumOptions options, TimeSpan commandTimeout)
             : base(StartDriverServiceCommandExecutor(service, options, commandTimeout), ConvertOptionsToCapabilities(options))
         {
             this.driverService = service;
+            this.disposeDriverService = disposeService;
             this.optionsCapabilityName = options.CapabilityName;
         }
 
@@ -466,6 +469,11 @@ protected override void Dispose(bool disposing)
                     this.devToolsSession.Dispose();
                     this.devToolsSession = null;
                 }
+
+                if (this.disposeDriverService)
+                {
+                    this.driverService.Dispose();
+                }
             }
 
             base.Dispose(disposing);

dotnet/src/webdriver/Edge/EdgeDriver.cs

@@ -53,7 +53,7 @@ public EdgeDriver()
         /// </summary>
         /// <param name="options">The <see cref="EdgeOptions"/> to be used with the Edge driver.</param>
         public EdgeDriver(EdgeOptions options)
-            : this(EdgeDriverService.CreateDefaultService(), options)
+            : this(EdgeDriverService.CreateDefaultService(), disposeService: true, options, RemoteWebDriver.DefaultCommandTimeout)
         {
         }
 
@@ -95,7 +95,7 @@ public EdgeDriver(string edgeDriverDirectory, EdgeOptions options)
         /// <param name="options">The <see cref="EdgeOptions"/> to be used with the Edge driver.</param>
         /// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>
         public EdgeDriver(string edgeDriverDirectory, EdgeOptions options, TimeSpan commandTimeout)
-            : this(EdgeDriverService.CreateDefaultService(edgeDriverDirectory), options, commandTimeout)
+            : this(EdgeDriverService.CreateDefaultService(edgeDriverDirectory), disposeService: true, options, commandTimeout)
         {
         }
 
@@ -117,7 +117,12 @@ public EdgeDriver(EdgeDriverService service, EdgeOptions options)
         /// <param name="options">The <see cref="EdgeOptions"/> to be used with the Edge driver.</param>
         /// <param name="commandTimeout">The maximum amount of time to wait for each command.</param>
         public EdgeDriver(EdgeDriverService service, EdgeOptions options, TimeSpan commandTimeout)
-            : base(service, options, commandTimeout)
+            : this(service, disposeService: false, options, commandTimeout)
+        {
+        }
+
+        private EdgeDriver(EdgeDriverService service, bool disposeService, EdgeOptions options, TimeSpan commandTimeout)
+            : base(service, disposeService, options, commandTimeout)
         {
             this.AddCustomEdgeCommands();
         }