| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "chrome/browser/password_manager/chrome_password_manager_client.h" | 6 #include "chrome/browser/password_manager/chrome_password_manager_client.h" |
| 7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
| 8 #include "chrome/browser/ui/autofill/password_generation_popup_observer.h" | 8 #include "chrome/browser/ui/autofill/password_generation_popup_observer.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 bool EditingPopupShowing() { | 129 bool EditingPopupShowing() { |
| 130 return observer_.popup_showing() && !observer_.password_visible(); | 130 return observer_.popup_showing() && !observer_.password_visible(); |
| 131 } | 131 } |
| 132 | 132 |
| 133 private: | 133 private: |
| 134 TestPopupObserver observer_; | 134 TestPopupObserver observer_; |
| 135 }; | 135 }; |
| 136 | 136 |
| 137 #if defined(USE_AURA) | 137 #if defined(USE_AURA) |
| 138 // Enabled on these platforms. | 138 // Enabled on these platforms. |
| 139 #define MAYBE_PopupShownAndPasswordSelected PopupShownAndPasswordSelected | 139 // Disabled due to flakiness, see http://crbug.com/407998 |
| 140 #define MAYBE_PopupShownAndDismissed PopupShownAndDismissed | 140 #define MAYBE_PopupShownAndPasswordSelected \ |
| 141 #define MAYBE_PopupShownAndDismissedByScrolling PopupShownAndDismissedByScrollin
g | 141 DISABLED_PopupShownAndPasswordSelected |
| 142 #define MAYBE_PopupShownAndDismissed DISABLED_PopupShownAndDismissed |
| 143 #define MAYBE_PopupShownAndDismissedByScrolling \ |
| 144 DISABLED_PopupShownAndDismissedByScrolling |
| 142 #else | 145 #else |
| 143 // Popup not enabled for these platforms yet. | 146 // Popup not enabled for these platforms yet. |
| 144 #define MAYBE_PopupShownAndPasswordSelected DISABLED_PopupShownAndPasswordSelect
ed | 147 #define MAYBE_PopupShownAndPasswordSelected \ |
| 148 DISABLED_PopupShownAndPasswordSelected |
| 145 #define MAYBE_PopupShownAndDismissed DISABLED_PopupShownAndDismissed | 149 #define MAYBE_PopupShownAndDismissed DISABLED_PopupShownAndDismissed |
| 146 #define MAYBE_PopupShownAndDismissedByScrolling DISABLED_PopupShownAndDismissedB
yScrolling | 150 #define MAYBE_PopupShownAndDismissedByScrolling \ |
| 151 DISABLED_PopupShownAndDismissedByScrolling |
| 147 #endif | 152 #endif |
| 148 | 153 |
| 149 IN_PROC_BROWSER_TEST_F(PasswordGenerationInteractiveTest, | 154 IN_PROC_BROWSER_TEST_F(PasswordGenerationInteractiveTest, |
| 150 MAYBE_PopupShownAndPasswordSelected) { | 155 MAYBE_PopupShownAndPasswordSelected) { |
| 151 FocusPasswordField(); | 156 FocusPasswordField(); |
| 152 EXPECT_TRUE(GenerationPopupShowing()); | 157 EXPECT_TRUE(GenerationPopupShowing()); |
| 153 SendKeyToPopup(ui::VKEY_DOWN); | 158 SendKeyToPopup(ui::VKEY_DOWN); |
| 154 SendKeyToPopup(ui::VKEY_RETURN); | 159 SendKeyToPopup(ui::VKEY_RETURN); |
| 155 | 160 |
| 156 // Selecting the password should fill the field and move focus to the | 161 // Selecting the password should fill the field and move focus to the |
| (...skipping 22 matching lines...) Expand all Loading... |
| 179 IN_PROC_BROWSER_TEST_F(PasswordGenerationInteractiveTest, | 184 IN_PROC_BROWSER_TEST_F(PasswordGenerationInteractiveTest, |
| 180 MAYBE_PopupShownAndDismissedByScrolling) { | 185 MAYBE_PopupShownAndDismissedByScrolling) { |
| 181 FocusPasswordField(); | 186 FocusPasswordField(); |
| 182 EXPECT_TRUE(GenerationPopupShowing()); | 187 EXPECT_TRUE(GenerationPopupShowing()); |
| 183 | 188 |
| 184 ASSERT_TRUE(content::ExecuteScript(GetRenderViewHost(), | 189 ASSERT_TRUE(content::ExecuteScript(GetRenderViewHost(), |
| 185 "window.scrollTo(100, 0);")); | 190 "window.scrollTo(100, 0);")); |
| 186 | 191 |
| 187 EXPECT_FALSE(GenerationPopupShowing()); | 192 EXPECT_FALSE(GenerationPopupShowing()); |
| 188 } | 193 } |
| OLD | NEW |