[py] Fixed Expected Conditions around frame switching

Cr-Mirrored-From: https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium
Cr-Mirrored-Commit: 861ef31cd25c42ffcb88e644e84144e3c456aafb
diff --git a/selenium/webdriver/support/expected_conditions.py b/selenium/webdriver/support/expected_conditions.py
index b886b89..ad3c08d 100644
--- a/selenium/webdriver/support/expected_conditions.py
+++ b/selenium/webdriver/support/expected_conditions.py
@@ -221,9 +221,9 @@
     def _predicate(driver):
         try:
             if hasattr(locator, '__iter__'):
-                driver.switch_to.frame(driver.find_element(locator))
+                driver.switch_to.frame(driver.find_element(*locator))
             else:
-                driver.switch_to.frame(driver.find_element(By.NAME, locator))
+                driver.switch_to.frame(locator)
             return True
         except NoSuchFrameException:
             return False
diff --git a/test/selenium/webdriver/common/webdriverwait_tests.py b/test/selenium/webdriver/common/webdriverwait_tests.py
index faf9f80..a86720b 100644
--- a/test/selenium/webdriver/common/webdriverwait_tests.py
+++ b/test/selenium/webdriver/common/webdriverwait_tests.py
@@ -204,15 +204,6 @@
     assert 'Example Expected text' == driver.find_element_by_id('inputRequired').get_attribute('value')
 
 
-def testExpectedConditionFrameToBeAvailableAndSwitchToItByName(driver, pages):
-    pages.load("blank.html")
-    with pytest.raises(TimeoutException):
-        WebDriverWait(driver, 1).until(EC.frame_to_be_available_and_switch_to_it('myFrame'))
-    driver.execute_script("setTimeout(function(){var f = document.createElement('iframe'); f.id='myFrame'; f.src = '" + pages.url('iframeWithAlert.html') + "'; document.body.appendChild(f)}, 200)")
-    WebDriverWait(driver, 1).until(EC.frame_to_be_available_and_switch_to_it('myFrame'))
-    assert 'click me' == driver.find_element_by_id('alertInFrame').text
-
-
 def testExpectedConditionFrameToBeAvailableAndSwitchToItByLocator(driver, pages):
     pages.load("blank.html")
     with pytest.raises(TimeoutException):