Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 2)

chrome/browser/ui/views/constrained_window_views_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
-#include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "ipc/ipc_message.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/window/dialog_delegate.h"
@@ skipping 92 matching lines @@
 // Tests the following:
 //
 // *) Initially focused view in a constrained dialog receives focus reliably.
 //
 // *) Constrained windows that are queued don't register themselves as
 //    accelerator targets until they are displayed.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents != NULL);
-  ConstrainedWindowTabHelper* constrained_window_helper =
-      ConstrainedWindowTabHelper::FromWebContents(web_contents);
-  ASSERT_TRUE(constrained_window_helper != NULL);
+  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
+      WebContentsModalDialogManager::FromWebContents(web_contents);
+  ASSERT_TRUE(web_contents_modal_dialog_manager != NULL);
 
   // Create a constrained dialog.  It will attach itself to web_contents.
   scoped_ptr<TestConstrainedDialog> test_dialog1(new TestConstrainedDialog);
   ConstrainedWindowViews* window1 = new ConstrainedWindowViews(
       web_contents, test_dialog1.get());
 
   views::FocusManager* focus_manager = window1->GetFocusManager();
   ASSERT_TRUE(focus_manager);
 
   // test_dialog1's text field should be focused.
   EXPECT_EQ(test_dialog1->GetInitiallyFocusedView(),
             focus_manager->GetFocusedView());
 
   // Now create a second constrained dialog.  This will also be attached to
   // web_contents, but will remain hidden since the test_dialog1 is still
   // showing.
   scoped_ptr<TestConstrainedDialog> test_dialog2(new TestConstrainedDialog);
   ConstrainedWindowViews* window2 = new ConstrainedWindowViews(
       web_contents, test_dialog2.get());
   // Should be the same focus_manager.
   ASSERT_EQ(focus_manager, window2->GetFocusManager());
 
   // 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->dialog_count());
+  ASSERT_EQ(2u, web_contents_modal_dialog_manager->dialog_count());
 
   // Now send a VKEY_RETURN to the browser.  This should result in closing
   // test_dialog1.
   EXPECT_TRUE(focus_manager->ProcessAccelerator(
       ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE)));
   content::RunAllPendingInMessageLoop();
 
   EXPECT_TRUE(test_dialog1->done());
   EXPECT_FALSE(test_dialog2->done());
-  EXPECT_EQ(1u, constrained_window_helper->dialog_count());
+  EXPECT_EQ(1u, web_contents_modal_dialog_manager->dialog_count());
 
   // test_dialog2 will be shown.  Focus should be on test_dialog2's text field.
   EXPECT_EQ(test_dialog2->GetInitiallyFocusedView(),
             focus_manager->GetFocusedView());
 
   int tab_with_constrained_window = browser()->active_index();
 
   // Create a new tab.
   chrome::NewTab(browser());
 
   // The constrained dialog should no longer be selected.
   EXPECT_NE(test_dialog2->GetInitiallyFocusedView(),
             focus_manager->GetFocusedView());
 
   browser()->tab_strip_model()->ActivateTabAt(tab_with_constrained_window,
                                               false);
 
   // Activating the previous tab should bring focus to the constrained window.
   EXPECT_EQ(test_dialog2->GetInitiallyFocusedView(),
             focus_manager->GetFocusedView());
 
   // Send another VKEY_RETURN, closing test_dialog2
   EXPECT_TRUE(focus_manager->ProcessAccelerator(
       ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE)));
   content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(test_dialog2->done());
-  EXPECT_EQ(0u, constrained_window_helper->dialog_count());
+  EXPECT_EQ(0u, web_contents_modal_dialog_manager->dialog_count());
 }
 
 // Tests that the constrained window is closed properly when its tab is
 // closed.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, TabCloseTest) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents != NULL);
-  ConstrainedWindowTabHelper* constrained_window_helper =
-      ConstrainedWindowTabHelper::FromWebContents(web_contents);
-  ASSERT_TRUE(constrained_window_helper != NULL);
+  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
+      WebContentsModalDialogManager::FromWebContents(web_contents);
+  ASSERT_TRUE(web_contents_modal_dialog_manager != NULL);
 
   // Create a constrained dialog.  It will attach itself to web_contents.
   scoped_ptr<TestConstrainedDialog> test_dialog(new TestConstrainedDialog);
   new ConstrainedWindowViews(
       web_contents, test_dialog.get());
 
   bool closed =
       browser()->tab_strip_model()->CloseWebContentsAt(
           browser()->tab_strip_model()->active_index(),
           TabStripModel::CLOSE_NONE);
@@ skipping 35 matching lines @@
       browser()->tab_strip_model()->active_index(),
       TabStripModel::CLOSE_NONE);
   content::RunAllPendingInMessageLoop();
   EXPECT_TRUE(test_dialog->done());
 }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 // Tests that backspace is not processed before it's sent to the web contents.
 // We do not run this test on Aura because key events are sent to the web
 // contents through a different code path that does not call
-// views::FocusManager::OnKeyEvent when ConstrainedWindow is focused.
+// views::FocusManager::OnKeyEvent when WebContentsModalDialog is focused.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest,
                        BackspaceSentToWebContent) {
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents != NULL);
 
   GURL url(chrome::kChromeUINewTabURL);
   ui_test_utils::NavigateToURL(browser(), url);
 
   ConstrainedWebDialogDelegate* cwdd = CreateConstrainedWebDialog(
       browser()->profile(),
       new ui::test::TestWebDialogDelegate(url),
       NULL,
       web_contents);
 
   ConstrainedWindowViews* cwv =
       static_cast<ConstrainedWindowViews*>(cwdd->GetWindow());
   cwv->FocusWebContentsModalDialog();
 
   BrowserView* browser_view = static_cast<BrowserView*>(browser()->window());
   ui::KeyEvent key_event(ui::ET_KEY_PRESSED,
                          ui::VKEY_BACK,
                          ui::EF_NONE,
                          false);
   bool not_consumed = browser_view->GetFocusManager()->OnKeyEvent(key_event);
   EXPECT_TRUE(not_consumed);
 }
 #endif  // defined(OS_WIN) && !defined(USE_AURA)