remove mixin and implement in remote webdriver

Author: navin772

py/selenium/webdriver/chromium/webdriver.py

@@ -16,14 +16,13 @@
 # under the License.
 
 from selenium.webdriver.chromium.remote_connection import ChromiumRemoteConnection
-from selenium.webdriver.common.driver_extensions.has_fedcm_dialog import HasFedCmDialog
 from selenium.webdriver.common.driver_finder import DriverFinder
 from selenium.webdriver.common.options import ArgOptions
 from selenium.webdriver.common.service import Service
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver
 
 
-class ChromiumDriver(HasFedCmDialog, RemoteWebDriver):
+class ChromiumDriver(RemoteWebDriver):
     """Controls the WebDriver instance of ChromiumDriver and allows you to
     drive the browser."""
 

py/selenium/webdriver/common/driver_extensions/has_fedcm_dialog.py

@@ -491,6 +491,8 @@ def ignore_local_proxy_environment_variables(self) -> None:
 
 class ArgOptions(BaseOptions):
     BINARY_LOCATION_ERROR = "Binary Location Must be a String"
+    # FedCM capability key
+    FEDCM_CAPABILITY = "fedcm:accounts"
 
     def __init__(self) -> None:
         super().__init__()

py/selenium/webdriver/common/options.py

@@ -43,6 +43,7 @@
 from selenium.common.exceptions import WebDriverException
 from selenium.webdriver.common.bidi.script import Script
 from selenium.webdriver.common.by import By
+from selenium.webdriver.common.options import ArgOptions
 from selenium.webdriver.common.options import BaseOptions
 from selenium.webdriver.common.print_page_options import PrintOptions
 from selenium.webdriver.common.timeouts import Timeouts
@@ -53,6 +54,7 @@
 )
 from selenium.webdriver.support.relative_locator import RelativeBy
 
+from ..common.fedcm.dialog import Dialog
 from .bidi_connection import BidiConnection
 from .client_config import ClientConfig
 from .command import Command
@@ -1245,3 +1247,90 @@ def fedcm(self) -> FedCM:
                 driver.fedcm.reset_cooldown()
         """
         return self._fedcm
+
+    @property
+    def supports_fedcm(self) -> bool:
+        """Returns whether the browser supports FedCM capabilities."""
+        return self.capabilities.get(ArgOptions.FEDCM_CAPABILITY, False)
+
+    def _require_fedcm_support(self):
+        """Raises an exception if FedCM is not supported."""
+        if not self.supports_fedcm:
+            raise WebDriverException(
+                "This browser does not support Federated Credential Management. "
+                "Please ensure you're using a supported browser."
+            )
+
+    @property
+    def dialog(self):
+        """Returns the FedCM dialog object for interaction."""
+        self._require_fedcm_support()
+        return Dialog(self)
+
+    def enable_fedcm_delay(self):
+        """Enables the promise rejection delay for FedCM.
+
+        Raises:
+            WebDriverException if FedCM not supported
+        """
+        self._require_fedcm_support()
+        self.fedcm.enable_delay()
+
+    def disable_fedcm_delay(self):
+        """Disables the promise rejection delay for FedCM.
+
+        FedCM by default delays promise resolution in failure cases for
+        privacy reasons. This method allows turning it off to let tests
+        run faster where this is not relevant.
+
+        Raises:
+            WebDriverException if FedCM not supported
+        """
+        self._require_fedcm_support()
+        self.fedcm.disable_delay()
+
+    def reset_fedcm_cooldown(self):
+        """Resets the FedCM dialog cooldown.
+
+        If a user agent triggers a cooldown when the account chooser is
+        dismissed, this method resets that cooldown so that the dialog
+        can be triggered again immediately.
+
+        Raises:
+            WebDriverException if FedCM not supported
+        """
+        self._require_fedcm_support()
+        self.fedcm.reset_cooldown()
+
+    def fedcm_dialog(self, timeout=5, poll_frequency=0.5, ignored_exceptions=None):
+        """Waits for and returns the FedCM dialog.
+
+        Args:
+            timeout: How long to wait for the dialog
+            poll_frequency: How frequently to poll
+            ignored_exceptions: Exceptions to ignore while waiting
+
+        Returns:
+            The FedCM dialog object if found
+
+        Raises:
+            TimeoutException if dialog doesn't appear
+            WebDriverException if FedCM not supported
+        """
+        from selenium.common.exceptions import NoAlertPresentException
+        from selenium.webdriver.support.wait import WebDriverWait
+
+        self._require_fedcm_support()
+
+        if ignored_exceptions is None:
+            ignored_exceptions = (NoAlertPresentException,)
+
+        def _check_fedcm():
+            try:
+                dialog = Dialog(self)
+                return dialog if dialog.type else None
+            except NoAlertPresentException:
+                return None
+
+        wait = WebDriverWait(self, timeout, poll_frequency=poll_frequency, ignored_exceptions=ignored_exceptions)
+        return wait.until(lambda _: _check_fedcm())

py/selenium/webdriver/remote/webdriver.py

@@ -100,7 +100,7 @@ def test_disable_fedcm_delay(self, driver):
         driver.fedcm.disable_delay()
 
     def test_fedcm_cooldown_reset(self, driver):
-        driver.fedcm_cooldown()
+        driver.reset_fedcm_cooldown()
 
     def test_fedcm_no_dialog_type_present(self, driver):
         with pytest.raises(NoAlertPresentException):
@@ -131,7 +131,7 @@ def test_fedcm_no_click_continue_present(self, driver):
             driver.fedcm.click_continue()
 
     def test_verify_dialog_type_after_cooldown_reset(self, driver):
-        driver.fedcm_cooldown()
+        driver.reset_fedcm_cooldown()
         driver.execute_script("triggerFedCm();")
         dialog = driver.fedcm_dialog()
         assert dialog.type == "AccountChooser"