The password manager python tests now logout from websites by cleaning the cookies.

components/test/data/password_manager/tests.py

Index: components/test/data/password_manager/tests.py
diff --git a/components/test/data/password_manager/tests.py b/components/test/data/password_manager/tests.py
index bdefcaa5dcaa9592d42a94b76586f95663e1dbc1..557ce4100fddf7e13b947d85d056ab00aa2c1eb5 100644
--- a/components/test/data/password_manager/tests.py
+++ b/components/test/data/password_manager/tests.py
@@ -35,12 +35,6 @@ class Facebook(WebsiteTest):
     self.FillPasswordInto("[name='pass']")
     self.Submit("[name='pass']")
 
-  def Logout(self):
-    self.WaitUntilDisplayed("#userNavigationLabel")
-    self.Click("#userNavigationLabel")
-    self.WaitUntilDisplayed("#logout_form [type='submit']")
-    self.Click("#logout_form [type='submit']")
-
 
 class Google(WebsiteTest):
 
@@ -50,9 +44,6 @@ class Google(WebsiteTest):
     self.FillPasswordInto("#Passwd")
     self.Submit("#Passwd")
 
-  def Logout(self):
-    self.GoTo("https://accounts.google.com/Logout")
-
 
 class Linkedin(WebsiteTest):
 
@@ -62,12 +53,6 @@ class Linkedin(WebsiteTest):
     self.FillPasswordInto("#session_password-login")
     self.Submit("#session_password-login")
 
-  def Logout(self):
-    self.WaitUntilDisplayed(".account-toggle")
-    self.HoverOver(".account-toggle")
-    self.WaitUntilDisplayed(".account-settings .act-set-action")
-    self.Click(".account-settings .act-set-action")
-
 
 class Mailru(WebsiteTest):
 
@@ -77,9 +62,6 @@ class Mailru(WebsiteTest):
     self.FillPasswordInto("#mailbox__password")
     self.Submit("#mailbox__password")
 
-  def Logout(self):
-    self.Click("#PH_logoutLink")
-
 
 class Nytimes(WebsiteTest):
 
@@ -89,9 +71,6 @@ class Nytimes(WebsiteTest):
     self.FillPasswordInto("#password")
     self.Submit("#password")
 
-  def Logout(self):
-    self.GoTo("https://myaccount.nytimes.com/gst/signout")
-
 
 class Pinterest(WebsiteTest):
 
@@ -101,9 +80,6 @@ class Pinterest(WebsiteTest):
     self.FillPasswordInto("[name='password']")
     self.Submit("[name='password']")
 
-  def Logout(self):
-    self.GoTo("https://www.pinterest.com/logout/")
-
 
 class Reddit(WebsiteTest):
 
@@ -115,9 +91,6 @@ class Reddit(WebsiteTest):
     self.Wait(2)
     self.Submit("#passwd_login")
 
-  def Logout(self):
-    self.Click("form[action='http://www.reddit.com/logout'] a")
-
 
 class Tumblr(WebsiteTest):
 
@@ -127,9 +100,6 @@ class Tumblr(WebsiteTest):
     self.FillPasswordInto("#signup_password")
     self.Submit("#signup_password")
 
-  def Logout(self):
-    self.GoTo("https://www.tumblr.com/logout")
-
 
 class Wikipedia(WebsiteTest):
 
@@ -139,9 +109,6 @@ class Wikipedia(WebsiteTest):
     self.FillPasswordInto("#wpPassword1")
     self.Submit("#wpPassword1")
 
-  def Logout(self):
-    self.GoTo("https://en.wikipedia.org/w/index.php?title=Special:UserLogout")
-
 
 class Yandex(WebsiteTest):
 
@@ -151,13 +118,6 @@ class Yandex(WebsiteTest):
     self.FillPasswordInto("#b-mail-domik-password11")
     self.Click(".b-mail-button__button")
 
-  def Logout(self):
-    while not self.IsDisplayed(".b-mail-dropdown__item__content"
-                               u".Выход.daria-action"):
-      self.ClickIfClickable(".header-user-pic.b-mail-dropdown__handle")
-      self.Wait(1)
-    self.Click(u".b-mail-dropdown__item__content.Выход.daria-action")
-
 
 # Disabled tests.
 
@@ -174,12 +134,6 @@ class Amazon(WebsiteTest):
     self.FillPasswordInto("[name='password']")
     self.Submit("[name='password']")
 
-  def Logout(self):
-    while not self.IsDisplayed("#nav-item-signout"):
-      self.Wait(1)
-      self.HoverOver("#nav-signin-title")
-    self.Click("#nav-item-signout")
-
 
 # Password not saved.
 class Ask(WebsiteTest):
@@ -193,10 +147,6 @@ class Ask(WebsiteTest):
     self.FillPasswordInto("[name='password']")
     self.Click(".signin_show.signin_submit")
 
-  def Logout(self):
-    self.WaitUntilDisplayed("#a16CnbSignInText")
-    self.Click("#a16CnbSignInText")
-
 
 # Password not saved.
 class Baidu(WebsiteTest):
@@ -209,10 +159,6 @@ class Baidu(WebsiteTest):
     self.FillPasswordInto("[name='password']")
     self.Submit("[name='password']")
 
-  def Logout(self):
-    self.Wait(1)
-    self.GoTo("https://passport.baidu.com/?logout&u=http://www.baidu.com")
-
 
 # http://crbug.com/368690
 class Cnn(WebsiteTest):
@@ -231,10 +177,6 @@ class Cnn(WebsiteTest):
     self.Click(".cnnOvrlyBtn.cnnBtnLogIn")
     self.Wait(5)
 
-  def Logout(self):
-    self.Wait(4)
-    self.Click("#hdr-auth .no-border.no-pad-right")
-
 
 # http://crbug.com/368690
 class Ebay(WebsiteTest):
@@ -245,12 +187,6 @@ class Ebay(WebsiteTest):
     self.FillPasswordInto("[name='pass']")
     self.Submit("[name='pass']")
 
-  def Logout(self):
-    self.WaitUntilDisplayed("#gh-ug")
-    self.Click("#gh-ug")
-    self.WaitUntilDisplayed("#gh-uo")
-    self.Click("#gh-uo")
-
 
 # Iframe, password saved but not autofileld.
 class Espn(WebsiteTest):
@@ -270,10 +206,6 @@ class Espn(WebsiteTest):
       self.ClickIfClickable("#submitBtn")
       self.Wait(1)
 
-  def Logout(self):
-    self.WaitUntilDisplayed("#signin .small")
-    self.Click("#signin .small")
-
 
 # http://crbug.com/367768
 class Live(WebsiteTest):
@@ -284,12 +216,6 @@ class Live(WebsiteTest):
     self.FillPasswordInto("[name='passwd']")
     self.Submit("[name='passwd']")
 
-  def Logout(self):
-    self.WaitUntilDisplayed("#c_meun")
-    self.Click("#c_meun")
-    self.WaitUntilDisplayed("#c_signout")
-    self.Click("#c_signout")
-
 
 # http://crbug.com/368690
 class One63(WebsiteTest):
@@ -302,10 +228,6 @@ class One63(WebsiteTest):
     self.FillPasswordInto(".ntes-loginframe-label-ipt[type='password']")
     self.Click(".ntes-loginframe-btn")
 
-  def Logout(self):
-    self.WaitUntilDisplayed("#js_N_navLogout")
-    self.Click("#js_N_navLogout")
-
 
 # http://crbug.com/368690
 class Vube(WebsiteTest):
@@ -321,10 +243,6 @@ class Vube(WebsiteTest):
       self.ClickIfClickable("[ng-click='login()']")
       self.Wait(1)
 
-  def Logout(self):
-    self.WaitUntilDisplayed("[ng-click='user.logout()']")
-    self.Click("[ng-click='user.logout()']")
-
 
 # Tests that can cause a crash.
 
@@ -337,12 +255,6 @@ class Yahoo(WebsiteTest):
     self.FillPasswordInto("#passwd")
     self.Submit("#passwd")
 
-  def Logout(self):
-    self.WaitUntilDisplayed(".tab.tab-user>.mod.view_default")
-    self.HoverOver(".tab.tab-user>.mod.view_default")
-    self.WaitUntilDisplayed("[data-pos='4'] .lbl.y-link-1")
-    self.Click("[data-pos='4'] .lbl.y-link-1")
-
 
 def Tests(environment):