[Cleanup] rename WebContentsModalDialogManager::IsShowingDialog() to IsDialogActive()

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/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ skipping 159 matching lines @@
       test_dialog2.get(),
       web_contents->GetView()->GetNativeView(),
       modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
   web_contents_modal_dialog_manager->ShowDialog(window2->GetNativeView());
   // 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_TRUE(web_contents_modal_dialog_manager->IsShowingDialog());
+  ASSERT_TRUE(web_contents_modal_dialog_manager->IsDialogActive());
 
   // 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_TRUE(web_contents_modal_dialog_manager->IsShowingDialog());
+  EXPECT_TRUE(web_contents_modal_dialog_manager->IsDialogActive());
 
   // 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()->tab_strip_model()->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_FALSE(web_contents_modal_dialog_manager->IsShowingDialog());
+  EXPECT_FALSE(web_contents_modal_dialog_manager->IsDialogActive());
 }
 
 // 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);
   WebContentsModalDialogManager* web_contents_modal_dialog_manager =
       WebContentsModalDialogManager::FromWebContents(web_contents);
@@ skipping 218 matching lines @@
   // Escape is not processed as accelerator before it's sent to web contents.
   EXPECT_FALSE(observer.widget_closed());
 
   content::RunAllPendingInMessageLoop();
 
   // Escape is processed as accelerator after it's sent to web contents.
   EXPECT_TRUE(observer.widget_closed());
 }
 
 #endif  // defined(OS_WIN) || (defined(USE_AURA) && defined(USE_X11))