Close the find bar on reload.

chrome/browser/ui/find_bar/find_bar_host_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/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 821 matching lines @@
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(NULL != web_contents);
 
   // Search for a text that exists within a link on the page.
   int ordinal = 0;
   EXPECT_EQ(2, FindInPageWchar(web_contents, L"html ",
                                kFwd, kIgnoreCase, &ordinal));
   EXPECT_EQ(1, ordinal);
 }
 
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindDisappearOnNavigate) {

[Finnur, 2014/09/04 12:45:10]

Should probably be named FindDisappearOnNavigateAndReload now.

[Deepak, 2014/09/04 13:18:15]

Done.

   // First we navigate to our special focus tracking page.
   GURL url = GetURL(kSimple);
   GURL url2 = GetURL(kFramePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   chrome::ShowFindBar(browser());
 
   gfx::Point position;
   bool fully_visible = false;
 
   // Make sure it is open.
   EXPECT_TRUE(GetFindBarWindowInfo(&position, &fully_visible));
   EXPECT_TRUE(fully_visible);
 
-  // Reload the tab and make sure Find window doesn't go away.
+  // Reload and make sure the Find window goes away.
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<NavigationController>(
           &browser()->tab_strip_model()->GetActiveWebContents()->
               GetController()));
   chrome::Reload(browser(), CURRENT_TAB);
   observer.Wait();
+  EXPECT_TRUE(GetFindBarWindowInfo(&position, &fully_visible));
+  EXPECT_FALSE(fully_visible);

[Finnur, 2014/09/04 12:45:10]

With this change, I'm not sure the added test (at the bottom of this file) buys
us anything. I think the changes to this test probably cover what needs to be
covered.

[Deepak, 2014/09/04 13:18:15]

Acknowledged.

 
+  // Opening Findbar again.
+  chrome::ShowFindBar(browser());
+
+  // Make sure it is open.
   EXPECT_TRUE(GetFindBarWindowInfo(&position, &fully_visible));
   EXPECT_TRUE(fully_visible);
 
   // Navigate and make sure the Find window goes away.
   ui_test_utils::NavigateToURL(browser(), url2);
 
   EXPECT_TRUE(GetFindBarWindowInfo(&position, &fully_visible));
   EXPECT_FALSE(fully_visible);
 }
 
@@ skipping 669 matching lines @@
 
   EXPECT_TRUE(chrome::ExecuteCommand(browser_incognito, IDC_FIND_NEXT));
   WebContents* web_contents_incognito =
       browser_incognito->tab_strip_model()->GetActiveWebContents();
   ui_test_utils::FindInPageNotificationObserver observer(
       web_contents_incognito);
   observer.Wait();
   EXPECT_EQ(ASCIIToUTF16("bar"),
             GetFindBarTextForBrowser(browser_incognito));
 }
+
+IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindDisappearOnReload) {
+  FindBar* find_bar = browser()->GetFindBarController()->find_bar();
+  if (find_bar->HasGlobalFindPasteboard())
+    return;

[Finnur, 2014/09/04 12:45:10]

Why is this needed if it is not needed in FindDisappearOnNavigation?

[Deepak, 2014/09/04 13:18:15]

Acknowledged.

+
+  // First we navigate to any page.
+  GURL url = GetURL(kSimple);
+  ui_test_utils::NavigateToURL(browser(), url);
+
+  // Search for the word "page".
+  int ordinal = 0;
+  gfx::Point position;
+  bool fully_visible = false;
+
+  WebContents* web_contents_1 =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  EXPECT_EQ(
+      1, FindInPageWchar(web_contents_1, L"page", kFwd, kIgnoreCase, &ordinal));
+
+  // Open the Find box.
+  EnsureFindBoxOpen();
+
+  EXPECT_EQ(ASCIIToUTF16("page"), GetFindBarText());
+  EXPECT_EQ(ASCIIToUTF16("1 of 1"),
+            GetFindBarMatchCountTextForBrowser(browser()));
+
+  content::WindowedNotificationObserver observer(
+      content::NOTIFICATION_LOAD_STOP,
+      content::Source<NavigationController>(&browser()
+                                                 ->tab_strip_model()
+                                                 ->GetActiveWebContents()
+                                                 ->GetController()));
+  // Reloading the tab.
+  chrome::Reload(browser(), CURRENT_TAB);
+  observer.Wait();
+  // Make sure Find box is closed.
+  EXPECT_TRUE(GetFindBarWindowInfo(&position, &fully_visible));
+  EXPECT_FALSE(fully_visible);
+}