| Index: chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc
|
| diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc
|
| index 80f25cf45aa9fcaf6ef9dc77a832f60c5c5cc0de..e5db354ea8852598bb55c526d12c7e0679eda908 100644
|
| --- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc
|
| +++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc
|
| @@ -80,7 +80,7 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, BasicOpenAndClose) {
|
| EXPECT_FALSE(IsBubbleShowing());
|
| ManagePasswordsBubbleView::ShowBubble(
|
| browser()->tab_strip_model()->GetActiveWebContents(),
|
| - ManagePasswordsBubbleModel::USER_ACTION);
|
| + ManagePasswordsBubbleView::USER_GESTURE);
|
| EXPECT_TRUE(IsBubbleShowing());
|
| const ManagePasswordsBubbleView* bubble =
|
| ManagePasswordsBubbleView::manage_password_bubble();
|
| @@ -93,7 +93,7 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, BasicOpenAndClose) {
|
| // And, just for grins, ensure that we can re-open the bubble.
|
| ManagePasswordsBubbleView::ShowBubble(
|
| browser()->tab_strip_model()->GetActiveWebContents(),
|
| - ManagePasswordsBubbleModel::USER_ACTION);
|
| + ManagePasswordsBubbleView::USER_GESTURE);
|
| EXPECT_TRUE(ManagePasswordsBubbleView::manage_password_bubble()->
|
| GetFocusManager()->GetFocusedView());
|
| EXPECT_TRUE(IsBubbleShowing());
|
| @@ -224,7 +224,7 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest,
|
| IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, CloseOnClick) {
|
| ManagePasswordsBubbleView::ShowBubble(
|
| browser()->tab_strip_model()->GetActiveWebContents(),
|
| - ManagePasswordsBubbleModel::AUTOMATIC);
|
| + ManagePasswordsBubbleView::AUTOMATIC);
|
| EXPECT_TRUE(IsBubbleShowing());
|
| EXPECT_FALSE(ManagePasswordsBubbleView::manage_password_bubble()->
|
| GetFocusManager()->GetFocusedView());
|
| @@ -235,7 +235,7 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, CloseOnClick) {
|
| IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, CloseOnEsc) {
|
| ManagePasswordsBubbleView::ShowBubble(
|
| browser()->tab_strip_model()->GetActiveWebContents(),
|
| - ManagePasswordsBubbleModel::AUTOMATIC);
|
| + ManagePasswordsBubbleView::AUTOMATIC);
|
| EXPECT_TRUE(IsBubbleShowing());
|
| ASSERT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_ESCAPE,
|
| false, false, false, false));
|
| @@ -253,7 +253,7 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, CloseOnKey) {
|
| content::WebContents* web_contents =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| ManagePasswordsBubbleView::ShowBubble(web_contents,
|
| - ManagePasswordsBubbleModel::AUTOMATIC);
|
| + ManagePasswordsBubbleView::AUTOMATIC);
|
| EXPECT_TRUE(IsBubbleShowing());
|
| EXPECT_FALSE(ManagePasswordsBubbleView::manage_password_bubble()->
|
| GetFocusManager()->GetFocusedView());
|
| @@ -282,7 +282,7 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, TwoTabsWithBubble) {
|
| EXPECT_FALSE(IsBubbleShowing());
|
| ManagePasswordsBubbleView::ShowBubble(
|
| browser()->tab_strip_model()->GetActiveWebContents(),
|
| - ManagePasswordsBubbleModel::AUTOMATIC);
|
| + ManagePasswordsBubbleView::AUTOMATIC);
|
| EXPECT_TRUE(IsBubbleShowing());
|
| TabStripModel* tab_model = browser()->tab_strip_model();
|
| EXPECT_EQ(0, tab_model->active_index());
|
|
|