Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / password_manager / password_generation_interactive_uitest.cc

diff --git a/src/chrome/browser/password_manager/password_generation_interactive_uitest.cc b/src/chrome/browser/password_manager/password_generation_interactive_uitest.cc
index d06fe19..686d1ad 100644 (file)
--- a/src/chrome/browser/password_manager/password_generation_interactive_uitest.cc
+++ b/src/chrome/browser/password_manager/password_generation_interactive_uitest.cc
@@ -74,7 +74,7 @@ class PasswordGenerationInteractiveTest : public InProcessBrowserTest {
     ui_test_utils::NavigateToURL(browser(), url);
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     // Clean up UI.
     ChromePasswordManagerClient* client =
         ChromePasswordManagerClient::FromWebContents(GetWebContents());
@@ -136,14 +136,19 @@ class PasswordGenerationInteractiveTest : public InProcessBrowserTest {
 
 #if defined(USE_AURA)
 // Enabled on these platforms.
-#define MAYBE_PopupShownAndPasswordSelected PopupShownAndPasswordSelected
-#define MAYBE_PopupShownAndDismissed PopupShownAndDismissed
-#define MAYBE_PopupShownAndDismissedByScrolling PopupShownAndDismissedByScrolling
+// Disabled due to flakiness, see http://crbug.com/407998
+#define MAYBE_PopupShownAndPasswordSelected \
+  DISABLED_PopupShownAndPasswordSelected
+#define MAYBE_PopupShownAndDismissed DISABLED_PopupShownAndDismissed
+#define MAYBE_PopupShownAndDismissedByScrolling \
+  DISABLED_PopupShownAndDismissedByScrolling
 #else
 // Popup not enabled for these platforms yet.
-#define MAYBE_PopupShownAndPasswordSelected DISABLED_PopupShownAndPasswordSelected
+#define MAYBE_PopupShownAndPasswordSelected \
+  DISABLED_PopupShownAndPasswordSelected
 #define MAYBE_PopupShownAndDismissed DISABLED_PopupShownAndDismissed
-#define MAYBE_PopupShownAndDismissedByScrolling DISABLED_PopupShownAndDismissedByScrolling
+#define MAYBE_PopupShownAndDismissedByScrolling \
+  DISABLED_PopupShownAndDismissedByScrolling
 #endif
 
 IN_PROC_BROWSER_TEST_F(PasswordGenerationInteractiveTest,