Refactor logic to init BrowserWatcher in Chromium-based browsers

Author: bonigarcia

src/main/java/io/github/bonigarcia/wdm/WebDriverManager.java

@@ -1716,25 +1716,7 @@ protected synchronized WebDriver instantiateDriver() {
                 case OPERA:
                 case CHROMIUM:
                 case EDGE:
-                    isHeadless = ((ChromiumOptions<?>) caps).toString()
-                            .contains("--headless");
-                    if (isHeadless) {
-                        LoggingPreferences logs = new LoggingPreferences();
-                        logs.enable(LogType.BROWSER, Level.ALL);
-                        String logCapName = managerType == EDGE
-                                ? EdgeOptions.LOGGING_PREFS
-                                : ChromeOptions.LOGGING_PREFS;
-                        ((ChromiumOptions<?>) caps).setCapability(logCapName,
-                                logs);
-                        capabilities = caps;
-
-                    } else {
-                        ((ChromiumOptions<?>) caps)
-                                .addExtensions(extensionPath.toFile());
-                        capabilities = ((ChromiumOptions<?>) caps)
-                                .addArguments("--whitelisted-extension-id="
-                                        + BROWSER_WATCHER_ID);
-                    }
+                    initBrowserWatcherForChromium(extensionPath, caps);
                     break;
                 case FIREFOX:
                     log.trace(
@@ -1772,6 +1754,26 @@ protected synchronized WebDriver instantiateDriver() {
         return driver;
     }
 
+    protected void initBrowserWatcherForChromium(Path extensionPath,
+            Capabilities caps) {
+        DriverManagerType managerType = getDriverManagerType();
+        isHeadless = ((ChromiumOptions<?>) caps).toString()
+                .contains("--headless");
+        if (isHeadless) {
+            LoggingPreferences logs = new LoggingPreferences();
+            logs.enable(LogType.BROWSER, Level.ALL);
+            String logCapName = managerType == EDGE ? EdgeOptions.LOGGING_PREFS
+                    : ChromeOptions.LOGGING_PREFS;
+            ((ChromiumOptions<?>) caps).setCapability(logCapName, logs);
+            capabilities = caps;
+
+        } else {
+            ((ChromiumOptions<?>) caps).addExtensions(extensionPath.toFile());
+            capabilities = ((ChromiumOptions<?>) caps).addArguments(
+                    "--whitelisted-extension-id=" + BROWSER_WATCHER_ID);
+        }
+    }
+
     protected Path getBrowserWatcherAsPath() throws IOException {
         Path extensionPath = null;
         String extFilename = "/browserwatcher-%s%s.crx";