Fix 8063: Find-in-page remains open on History/Downloads page...

chrome/browser/views/find_bar_win_uitest.cc

 // Copyright (c) 2006-2008 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 "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/views/find_bar_win.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/url_request/url_request_unittest.h"
 
 class FindInPageControllerTest : public UITest {
  public:
   FindInPageControllerTest() {
     show_window_ = true;
   }
 };
 
+const std::wstring kSimplePage = L"404_is_enough_for_us.html";
 const std::wstring kFramePage = L"files/find_in_page/frames.html";
 const std::wstring kFrameData = L"files/find_in_page/framedata_general.html";
 const std::wstring kUserSelectPage = L"files/find_in_page/user-select.html";
 const std::wstring kCrashPage = L"files/find_in_page/crash_1341577.html";
 const std::wstring kTooFewMatchesPage = L"files/find_in_page/bug_1155639.html";
 
 // This test loads a single-frame page and makes sure the ordinal returned makes
 // sense as we FindNext over all the items.
 TEST_F(FindInPageControllerTest, FindInPageOrdinal) {
   scoped_refptr<HTTPTestServer> server =
@@ skipping 161 matching lines @@
   EXPECT_EQ(5, tab->FindInPage(L"008.xml", FWD, IGNORE_CASE, false, NULL));
 }
 
 // The find window should not change its location just because we open and close
 // a new tab.
 TEST_F(FindInPageControllerTest, FindMovesOnTabClose_Issue1343052) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(L"chrome/test/data", NULL);
   ASSERT_TRUE(NULL != server.get());
 
-  GURL url = server->TestServerPageW(kFramePage);
+  GURL url = server->TestServerPageW(kSimplePage);
   scoped_ptr<TabProxy> tabA(GetActiveTab());
   ASSERT_TRUE(tabA->NavigateToURL(url));
   WaitUntilTabCount(1);
 
   scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get() != NULL);
 
   // Toggle the bookmark bar state.
   browser->ApplyAccelerator(IDC_SHOW_BOOKMARK_BAR);
   EXPECT_TRUE(WaitForBookmarkBarVisibilityChange(browser.get(), true));
@@ skipping 40 matching lines @@
   EXPECT_EQ(x, new_x);
   EXPECT_EQ(y, new_y);
 }
 
 // Make sure Find box disappears on Navigate but not on Refresh.
 TEST_F(FindInPageControllerTest, FindDisappearOnNavigate) {
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(L"chrome/test/data", NULL);
   ASSERT_TRUE(NULL != server.get());
 
-  GURL url = server->TestServerPageW(kUserSelectPage);
+  GURL url = server->TestServerPageW(kSimplePage);
   GURL url2 = server->TestServerPageW(kFramePage);
   scoped_ptr<TabProxy> tab(GetActiveTab());
   ASSERT_TRUE(tab->NavigateToURL(url));
   WaitUntilTabCount(1);
 
   scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get() != NULL);
 
   // Open the Find window and wait for it to animate.
   EXPECT_TRUE(browser->OpenFindInPage());
   EXPECT_TRUE(WaitForFindWindowVisibilityChange(browser.get(), true));
 
   // Reload the tab and make sure Find box doesn't go away.
   EXPECT_TRUE(tab->Reload());
   EXPECT_TRUE(WaitForFindWindowVisibilityChange(browser.get(), true));
 
   // Navigate and make sure the Find box goes away.
   EXPECT_TRUE(tab->NavigateToURL(url2));
   EXPECT_TRUE(WaitForFindWindowVisibilityChange(browser.get(), false));
 }
+
+// Make sure Find box disappears when History/Downloads page is opened, and
+// when a New Tab is opened.
+TEST_F(FindInPageControllerTest, FindDisappearOnNewTabAndHistory) {
+  scoped_refptr<HTTPTestServer> server =
+      HTTPTestServer::CreateServer(L"chrome/test/data", NULL);
+  ASSERT_TRUE(NULL != server.get());
+
+  GURL url = server->TestServerPageW(kSimplePage);
+  scoped_ptr<TabProxy> tab(GetActiveTab());
+  ASSERT_TRUE(tab->NavigateToURL(url));
+  WaitUntilTabCount(1);
+
+  scoped_ptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  ASSERT_TRUE(browser.get() != NULL);
+
+  // Open the Find window and wait for it to animate.
+  EXPECT_TRUE(browser->OpenFindInPage());
+  EXPECT_TRUE(WaitForFindWindowVisibilityChange(browser.get(), true));
+
+  // Open another tab (tab B).
+  EXPECT_TRUE(browser->AppendTab(url));
+  scoped_ptr<TabProxy> tabB(GetActiveTab());
+
+  // Wait for the Find box to disappear.
+  EXPECT_TRUE(WaitForFindWindowVisibilityChange(browser.get(), false));
+
+  // Close tab B.
+  EXPECT_TRUE(tabB->Close(true));
+
+  // Wait for the Find box to appear again.
+  EXPECT_TRUE(WaitForFindWindowVisibilityChange(browser.get(), true));
+
+  // Open History page.
+  EXPECT_TRUE(browser->RunCommand(IDC_SHOW_HISTORY));
+
+  // Wait for the Find box to disappear.
+  EXPECT_TRUE(WaitForFindWindowVisibilityChange(browser.get(), false));
+}