Index: chrome/browser/ui/views/constrained_window_views_browsertest.cc |
diff --git a/chrome/browser/ui/views/constrained_window_views_browsertest.cc b/chrome/browser/ui/views/constrained_window_views_browsertest.cc |
index 470566cc430a3dbf2612473648a82fa0d29b8317..7a16adac18f4a9913de7489f3ce2364ed45b7b91 100644 |
--- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc |
+++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc |
@@ -150,7 +150,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) { |
// test_dialog1's text field should still be the view that has focus. |
EXPECT_EQ(test_dialog1->GetInitiallyFocusedView(), |
focus_manager->GetFocusedView()); |
- ASSERT_EQ(2u, constrained_window_helper->constrained_window_count()); |
+ ASSERT_EQ(2u, constrained_window_helper->dialog_count()); |
// Now send a VKEY_RETURN to the browser. This should result in closing |
// test_dialog1. |
@@ -160,7 +160,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) { |
EXPECT_TRUE(test_dialog1->done()); |
EXPECT_FALSE(test_dialog2->done()); |
- EXPECT_EQ(1u, constrained_window_helper->constrained_window_count()); |
+ EXPECT_EQ(1u, constrained_window_helper->dialog_count()); |
// test_dialog2 will be shown. Focus should be on test_dialog2's text field. |
EXPECT_EQ(test_dialog2->GetInitiallyFocusedView(), |
@@ -187,7 +187,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) { |
ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE))); |
content::RunAllPendingInMessageLoop(); |
EXPECT_TRUE(test_dialog2->done()); |
- EXPECT_EQ(0u, constrained_window_helper->constrained_window_count()); |
+ EXPECT_EQ(0u, constrained_window_helper->dialog_count()); |
} |
// Tests that the constrained window is closed properly when its tab is |
@@ -272,7 +272,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, |
ConstrainedWindowViews* cwv = |
static_cast<ConstrainedWindowViews*>(cwdd->GetWindow()); |
- cwv->FocusConstrainedWindow(); |
+ cwv->FocusWebContentsModalDialog(); |
BrowserView* browser_view = static_cast<BrowserView*>(browser()->window()); |
ui::KeyEvent key_event(ui::ET_KEY_PRESSED, |